v5.1.15 (#134)

bfren · web-flow · commit 9f427f4740d7 · 2023-01-28T17:37:01.000Z
Minor updates
* Using latest base image
* Showing countdown on maintenance page

Build updates
* Don't sign in to GHCR
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -41,13 +41,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -46,13 +46,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx:nginx1.22-4.0.26
+FROM bfren/nginx:nginx1.22-4.0.27
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-proxy"
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.1.14
+5.1.15
diff --git a/overlay/www/maintenance.html b/overlay/www/maintenance.html
@@ -11,9 +11,26 @@
 <body>
 <h1>Maintenance</h1>
 <p>The site you requested is temporarily down for maintenance.  Please try again later.</p>
-<p class="muted">This page will auto-refresh every ten seconds.</p>
+<p class="muted">This page will auto-refresh in <span id="remaining">10</span>s.</p>
 <script type="text/javascript">
-    setTimeout("location.reload(true);", 10000);
+    let remaining = 10;
+    let countdown = function () {
+        // reload the page
+        if (remaining == 0) {
+            location.reload(true);
+            return;
+        }
+
+        // update the message and reduce time remaining
+        document.getElementById("remaining").innerText = remaining.toString();
+        remaining--;
+
+        // fire function again in one second
+        setTimeout(countdown, 1000);
+    }
+
+    // fire first time manually
+    countdown();
 </script>
 </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/nginx:nginx1.22-4.0.26`
	`1`	`+FROM bfren/nginx:nginx1.22-4.0.27`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-nginx-proxy"`
`4`	`4`