1
0
mirror of https://github.com/keeweb/keeweb.git synced 2024-06-22 07:16:38 +02:00

fixed docker build

This commit is contained in:
antelle 2020-04-08 20:23:45 +02:00
parent 8eb7366a4e
commit e795a317cc
No known key found for this signature in database
GPG Key ID: 094A2F2D6136A4EE
2 changed files with 9 additions and 12 deletions

View File

@ -37,15 +37,14 @@ ADD keeweb.conf /etc/nginx/conf.d/keeweb.conf
RUN wget https://github.com/keeweb/keeweb/archive/gh-pages.zip; \
unzip gh-pages.zip; \
rm gh-pages.zip; \
mv keeweb-gh-pages keeweb; \
mv keeweb-gh-pages keeweb;
# clone keeweb plugins
RUN wget https://github.com/keeweb/keeweb-plugins/archive/master.zip; \
unzip master.zip; \
rm master.zip; \
mv keeweb-plugins-master/docs keeweb/plugins; \
rm -rf keeweb-plugins-master \
rm keeweb/plugins/CNAME
rm -rf keeweb-plugins-master;
ADD entrypoint.sh /opt/entrypoint.sh
RUN chmod a+x /opt/entrypoint.sh

View File

@ -17,7 +17,7 @@ FROM nginx:stable
LABEL maintainer="antelle.net@gmail.com"
# install
RUN apt-get -y update && apt-get -y install openssl wget unzip
RUN apt-get -y update && apt-get -y install openssl curl unzip
# setup nginx
RUN rm -rf /etc/nginx/conf.d/*; \
@ -32,19 +32,17 @@ ADD keeweb.conf /etc/nginx/conf.d/keeweb.conf
ADD entrypoint.sh /opt/entrypoint.sh
RUN chmod a+x /opt/entrypoint.sh
# clone keeweb
RUN wget https://github.com/keeweb/keeweb/archive/gh-pages.zip; \
unzip gh-pages.zip; \
rm gh-pages.zip; \
mv keeweb-gh-pages keeweb; \
# add keeweb files
ADD dist keeweb
# clone keeweb plugins
RUN wget https://github.com/keeweb/keeweb-plugins/archive/master.zip; \
RUN curl -Ss -L -O https://github.com/keeweb/keeweb-plugins/archive/master.zip; \
unzip master.zip; \
rm master.zip; \
mv keeweb-plugins-master/docs keeweb/plugins; \
rm -rf keeweb-plugins-master \
rm keeweb/plugins/CNAME
rm -rf keeweb-plugins-master;
RUN apt-get -y remove curl unzip
ENTRYPOINT ["/opt/entrypoint.sh"]
CMD ["nginx"]