Skip to content

Commit

Permalink
Docker container server startup error +1 #832
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Beloborodov committed Jun 26, 2022
1 parent 76d9990 commit 1fe1114
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 8 deletions.
21 changes: 19 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -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/*
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) && \
Expand Down
8 changes: 6 additions & 2 deletions lingvodoc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 1 addition & 2 deletions server-requirements.txt → server-requirements-1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions server-requirements-final.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
matplotlib==1.5.3

0 comments on commit 1fe1114

Please sign in to comment.