diff --git a/deployment/docker/Dockerfile b/Dockerfile similarity index 76% rename from deployment/docker/Dockerfile rename to Dockerfile index d219502..b9deccb 100644 --- a/deployment/docker/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ADD . /cwebcomp/ # only add this next one if you have static files RUN mkdir static -RUN pip install -r ../../requirements.txt +RUN pip install -r requirements.txt RUN python manage.py collectstatic # only if you need celery @@ -25,13 +25,11 @@ RUN python manage.py collectstatic #COPY broker/celeryd /etc/default/celeryd # nginx config and script to be run -COPY nginx.conf /etc/nginx/sites-available/default -COPY start.sh /usr/local/bin/start.sh +COPY deployment/docker/nginx.conf /etc/nginx/sites-available/default +COPY deployment/docker/start.sh /usr/local/bin/start.sh # set proper file permissions -RUN chmod u+x /etc/init.d/celeryd && \ - chmod u+x /etc/default/celeryd && \ - chmod u+x /usr/local/bin/start.sh +RUN chmod u+x /usr/local/bin/start.sh EXPOSE 80 CMD ["/bin/bash", "-c", "start.sh"] \ No newline at end of file