Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development

daemon/.dockerignore

@@ -0,0 +1,3 @@
+Dockerfile
+.dockerignore
+*.bak

daemon/Dockerfile

@@ -4,7 +4,7 @@ FROM python:3.6-slim-stretch
 LABEL maintainer="inf_sfb1288@lists.uni-bielefeld.de"
 
 
-ARG docker_gid=998
+ARG docker_gid=999
 ARG gid=1000
 ARG uid=1000
 ENV LANG=C.UTF-8
@@ -25,16 +25,10 @@ USER nopaqued
 WORKDIR /home/nopaqued
 
 
-COPY ["logger", "logger"]
-COPY ["notify", "notify"]
-COPY ["tasks", "tasks"]
-COPY ["nopaqued.py", "requirements.txt", "./"]
+COPY --chown=nopaqued:nopaqued [".", "."]
 RUN python -m venv venv \
  && venv/bin/pip install --requirement requirements.txt \
  && mkdir logs
 
 
-COPY docker-entrypoint.sh /usr/local/bin/
-
-
-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["./docker-entrypoint.sh"]

daemon/docker-entrypoint.sh

@@ -5,4 +5,5 @@ wait-for-it db:5432 --strict --timeout=0
 echo "Waiting for web..."
 wait-for-it web:5000 --strict --timeout=0
 
-venv/bin/python nopaqued.py
+source venv/bin/activate
+python nopaqued.py