keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1642 from PeterDaveHello/DockerfileRefactor 

Clean up apt local cache in Dockerfile
This commit is contained in:
Dimitri Witkowski 2020-11-30 07:49:33 +01:00 committed by GitHub
parent 66a0cf4782 94cfa4f3d4
commit 54c721c265
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/docker-rpi/Dockerfile
View File

@ -31,7 +31,7 @@ RUN sed -i 's/access_log.*/access_log \/dev\/stdout;/g' /etc/nginx/nginx.conf; \
sed -i 's/error_log.*/error_log \/dev\/stdout info;/g' /etc/nginx/nginx.conf; \
sed -i 's/error_log \/dev\/stdout info;/error_log \/dev\/stdout info;\n\n# daemon mode off\ndaemon off;/g' /etc/nginx/nginx.conf
ADD keeweb.conf /etc/nginx/conf.d/keeweb.conf
COPY keeweb.conf /etc/nginx/conf.d/keeweb.conf
# clone keeweb
RUN wget https://github.com/keeweb/keeweb/archive/gh-pages.zip; \
@ -46,7 +46,7 @@ RUN wget https://github.com/keeweb/keeweb-plugins/archive/master.zip; \
mv keeweb-plugins-master/docs keeweb/plugins; \
rm -rf keeweb-plugins-master;
ADD entrypoint.sh /opt/entrypoint.sh
COPY entrypoint.sh /opt/entrypoint.sh
RUN chmod a+x /opt/entrypoint.sh
ENTRYPOINT ["/opt/entrypoint.sh"]

6
package/docker/Dockerfile
View File

@ -27,13 +27,13 @@ RUN sed -i 's/access_log.*/access_log \/dev\/stdout;/g' /etc/nginx/nginx.conf; \
sed -i 's/error_log.*/error_log \/dev\/stdout info;/g' /etc/nginx/nginx.conf; \
sed -i 's/^pid/daemon off;\npid/g' /etc/nginx/nginx.conf
ADD keeweb.conf /etc/nginx/conf.d/keeweb.conf
COPY keeweb.conf /etc/nginx/conf.d/keeweb.conf
ADD entrypoint.sh /opt/entrypoint.sh
COPY entrypoint.sh /opt/entrypoint.sh
RUN chmod a+x /opt/entrypoint.sh
# add keeweb files
ADD dist keeweb
COPY dist keeweb
# clone keeweb plugins
RUN curl -Ss -L -O https://github.com/keeweb/keeweb-plugins/archive/master.zip; \