From 1fe1114ecdc33c37f4f8702a3774d68be7af3cf3 Mon Sep 17 00:00:00 2001
From: Ivan Beloborodov <ivbel@ispras.ru>
Date: Sun, 26 Jun 2022 20:59:14 +0300
Subject: [PATCH] Docker container server startup error +1 #832

---
 .dockerignore                                 | 21 +++++++++++++++++--
 Dockerfile                                    |  4 ++--
 lingvodoc/__init__.py                         |  8 +++++--
 ...uirements.txt => server-requirements-1.txt |  3 +--
 server-requirements-final.txt                 |  1 +
 5 files changed, 29 insertions(+), 8 deletions(-)
 rename server-requirements.txt => server-requirements-1.txt (98%)
 create mode 100644 server-requirements-final.txt

diff --git a/.dockerignore b/.dockerignore
index 0103cbd1..7a783f6b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,11 +1,28 @@
 *.buffer
+*.csv
+*.doc
+*.docx
+*.eaf
 *.gz
+*.html
+*.json
+*.log*
+*.output
+*.pickle
 *.png
+*.pprint
+*.pfsx
+*.TextGrid
 *.utf16
 *.utf8
 *.xlsx
 *.zip
-.git
+.cache/*
+.eggs/*
 docker/dbdump/*
 docker/frontend/*
-pyramid.log*
+docs/*
+lingvodoc/assets/*
+lingvodoc/static/*
+sphinx/*
+webui/*
diff --git a/Dockerfile b/Dockerfile
index dd777757..4e856503 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,8 +26,8 @@ RUN \
 RUN \
   pip3 install pip==20.0.2 && \
   pip3 install --upgrade setuptools==44.0 && \
-  pip3 install -r server-requirements.txt && \
-  pip3 install alembic gunicorn==19.7.1
+  pip3 install -r server-requirements-1.txt && \
+  pip3 install -r server-requirements-final.txt
 RUN \
   locale-gen en_US.UTF-8 && update-locale && \
   ( curl -sS https://apertium.projectjj.com/apt/install-nightly.sh | bash ) && \
diff --git a/lingvodoc/__init__.py b/lingvodoc/__init__.py
index 613d7749..dcb82b59 100755
--- a/lingvodoc/__init__.py
+++ b/lingvodoc/__init__.py
@@ -179,8 +179,12 @@ def get_git_version(repository_dir):
         if path == version_path:
             continue
 
-        mtime = (
-            os.path.getmtime(path))
+        try:
+            mtime = (
+                os.path.getmtime(path))
+
+        except FileNotFoundError:
+            continue
 
         if (last_mtime is None or
             mtime > last_mtime):
diff --git a/server-requirements.txt b/server-requirements-1.txt
similarity index 98%
rename from server-requirements.txt
rename to server-requirements-1.txt
index 8d2190f0..375e623e 100644
--- a/server-requirements.txt
+++ b/server-requirements-1.txt
@@ -20,7 +20,7 @@ configparser==4.0.2
 cycler==0.10.0
 DataProperty==0.42.1
 defusedxml==0.6.0
-dill==0.3.4
+dill==0.3.5.1
 docutils==0.15.2
 dogpile.cache==0.6.8
 et-xmlfile==1.0.1
@@ -41,7 +41,6 @@ Logbook==1.1.0
 lxml==4.4.1
 Mako==1.0.4
 MarkupSafe==0.23
-matplotlib==1.5.3
 minio==6.0.0
 multiprocess
 nltk==3.5
diff --git a/server-requirements-final.txt b/server-requirements-final.txt
new file mode 100644
index 00000000..460af8a7
--- /dev/null
+++ b/server-requirements-final.txt
@@ -0,0 +1 @@
+matplotlib==1.5.3