v1.2.4 - simplify Docker setup

chiefonboarding · Jun 10, 2021 · add94e1 · add94e1
1 parent 34a5c4d
commit add94e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/back/Dockerfile b/back/Dockerfile
@@ -6,8 +6,8 @@ RUN apt-get install -y supervisor
 ENV PYTHONUNBUFFERED 1
 RUN mkdir -p /app
 WORKDIR /app
-COPY . .
-COPY /back/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY ./back/ .
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 RUN pip install -r requirements.txt
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
diff --git a/back/supervisord.conf b/back/supervisord.conf
@@ -8,7 +8,7 @@ loglevel=info                ; log level; default info; others: debug,warn,trace
 user=root
 
 [program:app]
-command=bash -c "cd /app/back/ && python manage.py collectstatic && python manage.py createcachetable && python manage.py migrate && gunicorn back.wsgi -b 0.0.0.0:8000"
+command=bash -c "cd /app && python manage.py collectstatic && python manage.py createcachetable && python manage.py migrate && gunicorn back.wsgi -b 0.0.0.0:8000"
 user=root
 
 stdout_logfile=/dev/stdout
@@ -17,7 +17,7 @@ stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 
 [program:scheduler]
-command=bash -c "cd /app/back/ && python manage.py qcluster"
+command=bash -c "cd /app && python manage.py qcluster"
 user=root
 
 stdout_logfile=/dev/stdout