diff --git a/Dockerfile b/Dockerfile index 8a5896f..0aea989 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,9 @@ ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 COPY requirements.txt ${APP_HOME} -COPY gunicorn-cfg.py ${APP_HOME} -COPY run.sh ${APP_HOME} -RUN chmod +x ${APP_HOME}/run.sh +#COPY gunicorn-cfg.py ${APP_HOME} +#COPY run.sh ${APP_HOME} +#RUN chmod +x ${APP_HOME}/run.sh # install python dependencies diff --git a/docker-compose.yml b/docker-compose.yml index a3fb9c2..1baf865 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,6 +36,10 @@ services: MYSQL_DATABASE: ${MYSQL_DATABASE} MYSQL_USER: ${MYSQL_USER} MYSQL_PASSWORD: ${MYSQL_PASSWORD} + volumes: + - .:/app:rw + - ./staticfiles:/app/static + - ./mediafiles:/app/media command: bash -c 'cd /app && ./run.sh' depends_on: mysql: diff --git a/run.sh b/run.sh old mode 100644 new mode 100755 index 14a92e3..0e23c92 --- a/run.sh +++ b/run.sh @@ -1,5 +1,6 @@ #!/bin/bash +cd src && python manage.py migrate && python manage.py fill_empty_db && -gunicorn --config gunicorn-cfg.py kalskeborec.wsgi +gunicorn --config ../gunicorn-cfg.py kalskeborec.wsgi