"new" versioning system/dep updates

Update zoeyvid/nginx-quic Docker tag to v114
Signed-off-by: Zoey <zoey@z0ey.de>

.github/workflows/caddy-latest.yml

@@ -0,0 +1,30 @@
+name: Docker push Caddy develop to latest
+on:
+  workflow_dispatch:
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Convert Username
+        id: un
+        run: echo "un=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ steps.un.outputs.un }}
+          password: ${{ github.token }}
+      - name: Push develop to latest
+        run: |
+          docker buildx imagetools create --tag ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy-${{ github.ref_name }}
+          docker buildx imagetools create --tag ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy-${{ github.ref_name }}
+      - name: Show Caddy version
+        run: |
+          docker run --rm --entrypoint caddy ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy version
+          docker run --rm --entrypoint caddy ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy version

.github/workflows/caddy.yml

@@ -46,5 +46,5 @@ jobs:
           platforms: linux/amd64,linux/arm64 #,linux/amd64/v2,linux/amd64/v3,linux/amd64/v4 #,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
-            ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy
+            ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy-${{ github.ref_name }}
-            ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy
+            ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:caddy-${{ github.ref_name }}

.github/workflows/docker-latest.yml

@@ -23,7 +23,9 @@ jobs:
       - name: Push develop to latest
         run: |
           docker buildx imagetools create --tag ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:latest ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ github.ref_name }}
+          docker buildx imagetools create --tag ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ github.run_number }} ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ github.ref_name }}
           docker buildx imagetools create --tag ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:latest ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ github.ref_name }}
+          docker buildx imagetools create --tag ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ github.run_number }} ghcr.io/${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:${{ github.ref_name }}
       - name: Show Nginx version
         run: |
           docker run --rm --entrypoint nginx ${{ steps.un.outputs.un }}/${{ github.event.repository.name }}:latest -V

.github/workflows/docker.yml

@@ -48,6 +48,12 @@ jobs:
           registry: ghcr.io
           username: ${{ steps.un.outputs.un }}
           password: ${{ github.token }}
+      - name: version
+        run: |
+          version="$(cat .version)+$(git rev-parse --short HEAD)"
+          sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/js/i18n/messages.json
+          sed -i "s|\"0.0.0\"|\"$version\"|g" frontend/package.json
+          sed -i "s|\"0.0.0\"|\"$version\"|g" backend/package.json
       - name: Build
         uses: docker/build-push-action@v4
         if: ${{ github.event_name != 'pull_request' }}

Caddy.Dockerfile

@@ -1,3 +1,3 @@
-FROM caddy:2.6.4-alpine
+FROM caddy:2.6.4
 RUN apk add --no-cache ca-certificates tzdata
 COPY Caddyfile /etc/caddy/Caddyfile

Dockerfile

@@ -1,11 +1,10 @@
 FROM --platform="$BUILDPLATFORM" alpine:3.17.3 as frontend
-COPY global   /build/global
+COPY frontend                        /build/frontend
-COPY frontend /build/frontend
+COPY global/certbot-dns-plugins.js   /build/frontend/certbot-dns-plugins.js
 ARG NODE_ENV=production \
     NODE_OPTIONS=--openssl-legacy-provider
 RUN apk add --no-cache ca-certificates nodejs yarn git python3 build-base && \
     cd /build/frontend && \
-    sed -i "s|\"0.0.0\"|\""$(cat ../global/.version)"\"|g" package.json && \
     yarn --no-lockfile install && \
     yarn --no-lockfile build && \
     yarn cache clean --all
@@ -14,14 +13,13 @@ COPY security.txt /build/frontend/dist/.well-known/security.txt
 
 
 FROM --platform="$BUILDPLATFORM" alpine:3.17.3 as backend
-COPY backend /build/backend
+COPY backend                        /build/backend
-COPY global  /build/backend/global
+COPY global/certbot-dns-plugins.js  /build/backend/certbot-dns-plugins.js
 ARG NODE_ENV=production \
     TARGETARCH
 RUN apk add --no-cache ca-certificates nodejs-current yarn && \
     wget https://gobinaries.com/tj/node-prune -O - | sh && \
     cd /build/backend && \
-    sed -i "s|\"0.0.0\"|\""$(cat global/.version)"\"|g" package.json && \
     if [ "$TARGETARCH" = "amd64" ]; then \
     npm_config_target_platform=linux npm_config_target_arch=x64 yarn install --no-lockfile; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
@@ -36,7 +34,7 @@ RUN apk add --no-cache build-base libffi-dev && \
     . /usr/local/certbot/bin/activate && \
     pip install --no-cache-dir certbot
 
-FROM zoeyvid/nginx-quic:113
+FROM zoeyvid/nginx-quic:114
 RUN apk add --no-cache ca-certificates tzdata \
     nodejs-current \
     openssl apache2-utils \

README.md

@@ -1,5 +1,6 @@
 <p align="center" class="items-center">
 	<img src="https://nginxproxymanager.com/github.png">
+    <!---
 	<br><br>
 	<img src="https://img.shields.io/badge/version-2.10.2+-green.svg?style=for-the-badge">
 	<a href="https://hub.docker.com/r/zoeyvid/nginx-proxy-manager">
@@ -8,6 +9,7 @@
 	<a href="https://hub.docker.com/r/zoeyvid/nginx-proxy-manager">
 		<img src="https://img.shields.io/docker/pulls/zoeyvid/nginx-proxy-manager.svg?style=for-the-badge">
 	</a>
+    --->
 </p>
 
 
@@ -25,8 +27,10 @@ proxying hosts with TLS termination and it had to be so easy that a monkey could
 While there might be advanced options they are optional and the project should be as simple as possible
 so that the barrier for entry here is low.
 
+<!---
 ### Sponsor the original creator (not us):
 <a href="https://www.buymeacoffee.com/jc21" target="_blank"><img src="http://public.jc21.com/github/by-me-a-coffee.png" alt="Buy Me A Coffee" style="height: 51px !important;width: 217px !important;" ></a>
+--->
 
 
 ## Features
@@ -187,9 +191,10 @@ Password: iArhP1j7p1P6TA92FA2FMbbUGYqwcYzxC4AVEe12Wbi94FY9gNN62aKyF1shrvG4NycjjX
 Immediately after logging in with this default user you will be asked to modify your details and change your password.
 
 
-## Contributors (original NPM)
+## Contributors/Sponsor original NPM
 
 Special thanks to [all of our contributors](https://github.com/NginxProxyManager/nginx-proxy-manager/graphs/contributors).
+If you want to sponsor them, please see [here](https://github.com/NginxProxyManager/nginx-proxy-manager/blob/master/README.md).
 
 
 # Please report Bugs first to this fork before reporting them to the original Repository

backend/internal/certificate.js

@@ -7,7 +7,7 @@ const logger           = require('../logger').ssl;
 const error            = require('../lib/error');
 const utils            = require('../lib/utils');
 const certificateModel = require('../models/certificate');
-const dnsPlugins       = require('../global/certbot-dns-plugins');
+const dnsPlugins       = require('../certbot-dns-plugins');
 const internalAuditLog = require('./audit-log');
 const internalNginx    = require('./nginx');
 const internalHost     = require('./host');

backend/package.json

@@ -30,7 +30,7 @@
   "author": "Jamie Curnow <jc@jc21.com>",
   "license": "MIT",
   "devDependencies": {
-    "eslint": "8.38.0",
+    "eslint": "8.40.0",
     "eslint-plugin-align-assignments": "1.1.2"
   }
 }

backend/setup.js

@@ -6,7 +6,7 @@ const userPermissionModel = require('./models/user_permission');
 const utils               = require('./lib/utils');
 const authModel           = require('./models/auth');
 const settingModel        = require('./models/setting');
-const dns_plugins         = require('./global/certbot-dns-plugins');
+const dns_plugins         = require('./certbot-dns-plugins');
 
 /**
  * Creates a default admin users if one doesn't already exist in the database

frontend/js/app/nginx/certificates/form.js

@@ -4,7 +4,7 @@ const App              = require('../../main');
 const CertificateModel = require('../../../models/certificate');
 const template         = require('./form.ejs');
 const i18n             = require('../../i18n');
-const dns_providers    = sortProvidersAlphabetically(require('../../../../../global/certbot-dns-plugins'));
+const dns_providers    = sortProvidersAlphabetically(require('../../../../certbot-dns-plugins'));
 
 require('jquery-serializejson');
 require('selectize');

frontend/js/app/nginx/certificates/list/item.js

@@ -2,7 +2,7 @@ const Mn            = require('backbone.marionette');
 const moment        = require('moment');
 const App           = require('../../../main');
 const template      = require('./item.ejs');
-const dns_providers = require('../../../../../../global/certbot-dns-plugins');
+const dns_providers = require('../../../../../certbot-dns-plugins');
 
 module.exports = Mn.View.extend({
     template: template,

frontend/js/app/nginx/dead/form.js

@@ -5,7 +5,7 @@ const template             = require('./form.ejs');
 const certListItemTemplate = require('../certificates-list-item.ejs');
 const Helpers              = require('../../../lib/helpers');
 const i18n                 = require('../../i18n');
-const dns_providers        = require('../../../../../global/certbot-dns-plugins');
+const dns_providers        = require('../../../../certbot-dns-plugins');
 
 require('jquery-serializejson');
 require('selectize');

frontend/js/app/nginx/proxy/form.js

@@ -8,7 +8,7 @@ const accessListItemTemplate = require('./access-list-item.ejs');
 const CustomLocation         = require('./location');
 const Helpers                = require('../../../lib/helpers');
 const i18n                   = require('../../i18n');
-const dns_providers          = require('../../../../../global/certbot-dns-plugins');
+const dns_providers          = require('../../../../certbot-dns-plugins');
 
 
 require('jquery-serializejson');

frontend/js/app/nginx/redirection/form.js

@@ -5,7 +5,7 @@ const template             = require('./form.ejs');
 const certListItemTemplate = require('../certificates-list-item.ejs');
 const Helpers              = require('../../../lib/helpers');
 const i18n                 = require('../../i18n');
-const dns_providers        = require('../../../../../global/certbot-dns-plugins');
+const dns_providers        = require('../../../../certbot-dns-plugins');
 
 
 require('jquery-serializejson');

frontend/js/app/ui/footer/main.ejs

@@ -12,6 +12,7 @@
     <div class="col-12 col-lg-auto mt-3 mt-lg-0 text-center">
         <%- i18n('main', 'version', {version: getVersion()}) %>
         <%= i18n('footer', 'copy', {url: 'https://jc21.com'}) %>
+        <%= i18n('footer', 'copyzv', {url: 'https://zoeyvid.de'}) %>
         <%= i18n('footer', 'theme', {url: 'https://tabler.github.io'}) %>
     </div>
 </div>

frontend/js/i18n/messages.json

@@ -42,7 +42,7 @@
     },
     "main": {
       "app": "Nginx Proxy Manager",
-      "version": "v{version}+",
+      "version": "0.0.0",
       "welcome": "Welcome to Nginx Proxy Manager",
       "logged-in": "You are logged in as {name}",
       "unknown-error": "Error loading stuff. Please reload the app.",
@@ -60,8 +60,9 @@
     },
     "footer": {
       "fork-me": "Repository on GitHub",
-      "copy": "&copy; 2022 <a href=\"{url}\" target=\"_blank\">jc21.com</a>.",
+      "copy": "&copy; 2022 <a href=\"{url}\" target=\"_blank\">jc21.com</a>",
-      "theme": "Theme by <a href=\"{url}\" target=\"_blank\">Tabler</a>"
+      "copyzv": "and 2023 <a href=\"{url}\" target=\"_blank\">ZoeyVid</a> MIT-License.",
+      "theme": "Theme by <a href=\"{url}\" target=\"_blank\">Tabler v0.0.31</a>"
     },
     "dashboard": {
       "title": "Hi {name}"

rootfs/bin/start.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ "$(whoami)" != "root" ]; then
+if [ "$(whoami)" != "root" ] || [ "$(id -u)" != "0" ] || [ "$(id -g)" != "0" ]; then
 	echo '--------------------------------------'
 	echo "This docker container must be run as root, do not specify a user."
 	echo '--------------------------------------'
@@ -303,6 +303,7 @@ find /data/nginx -type f -name '*.conf' -exec sed -i "s|include conf.d/include/l
 find /data/nginx -type f -name '*.conf' -exec sed -i "/Asset Caching/d" {} \;
 find /data/nginx -type f -name '*.conf' -exec sed -i "/assets.conf/d" {} \;
 
+find /data/nginx -type f -name '*.conf' -exec sed -i "/error_log/d" {} \;
 find /data/nginx -type f -name '*.conf' -exec sed -i "/access_log/d" {} \;
 find /data/nginx -type f -name '*.conf' -exec sed -i "/proxy_http_version/d" {} \;
 
@@ -485,22 +486,22 @@ fi
 export NPM_PORT="${NPM_PORT:-81}"
 
 if [ -n "$NPM_IPV4_BINDING" ]; then
-    sed -i "s/#\?listen \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+:\)\?\(bep\)/listen $NPM_IPV4_BINDING:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm.conf
+    sed -i "s/#\?listen \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+:\)\?\([0-9]\+\)/listen $NPM_IPV4_BINDING:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm.conf
-    sed -i "s/#\?listen \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+:\)\?\(bep\)/listen $NPM_IPV4_BINDING:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
+    sed -i "s/#\?listen \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+:\)\?\([0-9]\+\)/listen $NPM_IPV4_BINDING:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
 else
-    sed -i "s/#\?listen \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+:\)\?\(bep\)/listen $NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm.conf
+    sed -i "s/#\?listen \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+:\)\?\([0-9]\+\)/listen $NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm.conf
-    sed -i "s/#\?listen \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+:\)\?\(bep\)/listen $NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
+    sed -i "s/#\?listen \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+:\)\?\([0-9]\+\)/listen $NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
 fi
 
 if [ "$NPM_DISABLE_IPV6" = "true" ]; then
-    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\(bep\)/#listen \[\1\]:\2/g" /usr/local/nginx/conf/conf.d/npm.conf
+    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\([0-9]\+\)/#listen \[\1\]:\2/g" /usr/local/nginx/conf/conf.d/npm.conf
-    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\(bep\)/#listen \[\1\]:\2/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
+    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\([0-9]\+\)/#listen \[\1\]:\2/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
 elif [ -n "$NPM_IPV6_BINDING" ]; then
-    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\(bep\)/listen $NPM_IPV6_BINDING:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm.conf
+    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\([0-9]\+\)/listen $NPM_IPV6_BINDING:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm.conf
-    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\(bep\)/listen $NPM_IPV6_BINDING:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
+    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\([0-9]\+\)/listen $NPM_IPV6_BINDING:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
 else
-    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\(bep\)/listen \[::\]:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm.conf
+    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\([0-9]\+\)/listen \[::\]:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm.conf
-    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\(bep\)/listen \[::\]:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
+    sed -i "s/#\?listen \[\([0-9a-f:]\+\)\]:\([0-9]\+\)/listen \[::\]:$NPM_PORT/g" /usr/local/nginx/conf/conf.d/npm-no-server-name.conf
 fi
 
 if [ "$DISABLE_HTTP" = "true" ]; then

rootfs/usr/local/nginx/conf/conf.d/npm-no-server-name.conf

@@ -1,9 +1,9 @@
 server {
-    listen bep ssl http2;
+    listen 81 ssl http2;
-    listen bep quic;
+    listen 81 quic;
 
-    listen [::]:bep ssl http2;
+    listen [::]:81 ssl http2;
-    listen [::]:bep quic;
+    listen [::]:81 quic;
 
     server_name "";
     return 444;

rootfs/usr/local/nginx/conf/conf.d/npm.conf

@@ -1,9 +1,9 @@
 server {
-    listen bep ssl http2 default_server;
+    listen 81 ssl http2 default_server;
-    listen bep quic default_server;
+    listen 81 quic default_server;
     
-    listen [::]:bep ssl http2 default_server;
+    listen [::]:81 ssl http2 default_server;
-    listen [::]:bep quic default_server;
+    listen [::]:81 quic default_server;
     add_header alt-svc 'h3=":443"; ma=86400, h3-29=":443"; ma=86400';
     http3 on;