Skip to content

Commit

Permalink
Merge pull request #53 from arthur-schnitzler/52-check-and-revise-doc…
Browse files Browse the repository at this point in the history
…ker-file

52 check and revise docker file
  • Loading branch information
csae8092 authored Jan 4, 2024
2 parents cb200ee + 65594f0 commit 15ae991
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
myenv
env
venv
staticfiles
db.sqlite3
cover
htmlcov
media/uploads/*.rdf
media/uploads/*.ttl
.secret
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3.10
FROM python:3.11-buster

RUN apt-get update -y && apt-get upgrade -y
RUN apt-get install nginx g++ gcc libmariadb-dev vim cron tzdata -y
RUN apt-get install postgresql-common libpq-dev nginx g++ gcc vim cron tzdata -y
RUN ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log
ENV TZ="Europe/Vienna"
Expand All @@ -11,6 +11,7 @@ COPY nginx.default /etc/nginx/sites-available/default
RUN mkdir -p /opt/app
COPY requirements.txt /opt/app/
RUN pip install -U pip --no-cache-dir && pip install -r /opt/app/requirements.txt --no-cache-dir
RUN pip install gunicorn
COPY . /opt/app
WORKDIR /opt/app
RUN chown -R www-data:www-data /opt/app && chmod -R 755 /opt/app/media
Expand Down
3 changes: 3 additions & 0 deletions pmb/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
# SECURITY WARNING: don't run with debug turned on in production!
if os.environ.get("DEBUG"):
DEBUG = True
else:
DEBUG = False

ALLOWED_HOSTS = ["*"]

Expand All @@ -24,6 +26,7 @@
# Application definition

INSTALLED_APPS = [
"apis_override_select2js",
"dal",
"dal_select2",
"django_extensions",
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ acdh_geonames_utils
acdh-id-reconciler>=0.2,<1
acdh-tei-pyutils>=0.34,<1
acdh-wikidata-pyutils>=0.2.1,<1
apis-override-select2js==0.1
Django>4.1,<6
django-admin-csvexport
django-autocomplete-light
Expand Down

0 comments on commit 15ae991

Please sign in to comment.