From e795a317cc76d540cf52dd62cf84188a92550af5 Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Wed, 8 Apr 2020 20:23:45 +0200
Subject: [PATCH] fixed docker build

---
 package/docker-rpi/Dockerfile |  5 ++---
 package/docker/Dockerfile     | 16 +++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/package/docker-rpi/Dockerfile b/package/docker-rpi/Dockerfile
index 4044476c..eaa760ae 100644
--- a/package/docker-rpi/Dockerfile
+++ b/package/docker-rpi/Dockerfile
@@ -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
diff --git a/package/docker/Dockerfile b/package/docker/Dockerfile
index c46f43a6..39c4cf61 100644
--- a/package/docker/Dockerfile
+++ b/package/docker/Dockerfile
@@ -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"]