Merge pull request #2 from talltechdude/upgrade-2.1.1

Upgrade 2.1.1

Author: talltechdude

proxy-manager/Dockerfile

@@ -19,8 +19,8 @@ RUN \
     && apk add --no-cache \
         apache2-utils=2.4.41-r0 \
         certbot=1.0.0-r0 \
-        mariadb-client=10.4.10-r0 \
-        mariadb=10.4.10-r0 \
+        mariadb-client=10.4.12-r0 \
+        mariadb=10.4.12-r0 \
         nginx-mod-stream=1.16.1-r6 \
         nginx=1.16.1-r6 \
         nodejs=12.15.0-r1 \
@@ -30,34 +30,46 @@ RUN \
     && yarn global add modclean \
     \
     && curl -J -L -o /tmp/nginxproxymanager.tar.gz \
-        "https://github.com/jc21/nginx-proxy-manager/archive/2.0.14.tar.gz" \
+        "https://github.com/jc21/nginx-proxy-manager/archive/v2.1.1.tar.gz" \
     && mkdir /app \
     && tar zxvf \
         /tmp/nginxproxymanager.tar.gz \
         --strip 1 -C /app \
     \
     && sed -i "s#canShow('streams')#false#g" \
-        /app/src/frontend/js/app/ui/menu/main.ejs \
+        /app/frontend/js/app/ui/menu/main.ejs \
     && sed -i "s#canShow('streams')#false#g" \
-        /app/src/frontend/js/app/dashboard/main.ejs \
+        /app/frontend/js/app/dashboard/main.ejs \
     && sed -i "s#, 'streams',#,#g" \
-        /app/src/frontend/js/app/user/permissions.ejs \
+        /app/frontend/js/app/user/permissions.ejs \
     \
-    && cd /app \
+    && cd /app/frontend \
     && yarn install \
-    && npm run-script build \
+    && yarn build \
     && rm -rf node_modules \
-    && yarn install --production \
     \
-    && mkdir -p /opt/nginx-proxy-manager/src \
-    && cp -r /app/dist /opt/nginx-proxy-manager/ \
-    && cp -r /app/knexfile.js /opt/nginx-proxy-manager/ \
-    && cp -r /app/node_modules /opt/nginx-proxy-manager/ \
-    && cp -r /app/package.json /opt/nginx-proxy-manager/ \
-    && cp -r /app/src/backend /opt/nginx-proxy-manager/src/ \
+    && mkdir -p /opt/nginx-proxy-manager/frontend \
+    && cp -r /app/frontend/dist/. /opt/nginx-proxy-manager/frontend/ \
+    \
+    && cd /app/backend \
+    && yarn install \
+    && yarn eslint . \
+    && rm -rf node_modules \
+    && cp -r /app/backend/. /opt/nginx-proxy-manager/ \
+    \
+    && cd /opt/nginx-proxy-manager \
+    && yarn install \
+    && rm -rf /etc/services.d/frontend \
+    && rm -rf /opt/nginx-proxy-manager/config \
     \
     && rm -f -r /etc/nginx \
-    && cp -r /app/rootfs/etc/nginx /etc/nginx \
+    && cp -r /app/docker/rootfs/etc/nginx /etc/nginx \
+    && rm -f /etc/nginx/conf.d/dev.conf \ 
+    \
+    && sed -i "s#root /app/frontend;#root /opt/nginx-proxy-manager/frontend;#" \
+        /etc/nginx/conf.d/production.conf \
+    && sed -i "s#table.string('id').notNull().primary();#table.string('id', 32).notNull().primary();#" \
+        /opt/nginx-proxy-manager/migrations/20190227065017_settings.js \
     \
     && mkdir -p \
         /run/mysqld \

proxy-manager/rootfs/etc/cont-init.d/npm.sh

@@ -7,15 +7,15 @@
 sed -i 's#/data/logs/error.log#/proc/1/fd/1#g' /etc/nginx/nginx.conf
 sed -i 's#/data/logs/default.log#/proc/1/fd/1#g' /etc/nginx/nginx.conf
 sed -i 's#/data/logs/dead_host-{{ id }}.log#/proc/1/fd/1#g' \
-    /opt/nginx-proxy-manager/src/backend/templates/dead_host.conf
+    /opt/nginx-proxy-manager/templates/dead_host.conf
 sed -i 's#/data/logs/redirection_host-{{ id }}.log#/proc/1/fd/1#g' \
-    /opt/nginx-proxy-manager/src/backend/templates/redirection_host.conf
+    /opt/nginx-proxy-manager/templates/redirection_host.conf
 sed -i 's#/data/logs/proxy_host-{{ id }}.log#/proc/1/fd/1#g' \
-    /opt/nginx-proxy-manager/src/backend/templates/proxy_host.conf
+    /opt/nginx-proxy-manager/templates/proxy_host.conf
 sed -i 's#/data/logs/manager.log#/proc/1/fd/1#g' /etc/nginx/conf.d/default.conf
 sed -i 's#/data/logs/default.log#/proc/1/fd/1#g' /etc/nginx/conf.d/default.conf
 sed -i 's#/data/logs/letsencrypt-requests.log#/proc/1/fd/1#g' \
-    /opt/nginx-proxy-manager/src/backend/templates/letsencrypt-request.conf
+    /opt/nginx-proxy-manager/templates/letsencrypt-request.conf
 
 # Store cache in a temporary folder
 sed -i 's#/var/lib/nginx/cache/public#/tmp/nginx/cache/public#g' \

proxy-manager/rootfs/root/.config/letsencrypt/cli.ini renamed to proxy-manager/rootfs/etc/letsencrypt.ini

@@ -22,4 +22,4 @@ fi
 cd /opt/nginx-proxy-manager \
     || bashio::exit.nok "Could not change directory to app"
 
-exec node "${options[@]}" /opt/nginx-proxy-manager/src/backend/index.js
+exec node "${options[@]}" /opt/nginx-proxy-manager/index.js