MassiveAtoms/calibre-web-companion
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Shaquille Soekhlal
2021-02-15 11:41:31 +01:00
parent fd77792688
commit 9160a37378
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/docker/Dockerfile → Dockerfile
View File

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