update 1.24.0

2023-04-26 09:15:34 +02:00
parent 7c05bc5b41
commit 33bd88a672
9 changed files with 73 additions and 94 deletions
--- a/amd64.dockerfile
+++ b/amd64.dockerfile
@@ -1,6 +1,6 @@
 # :: Build
 	FROM alpine:latest as nginx
-	ENV NGINX_VERSION 1.22.1
+	ENV NGINX_VERSION 1.24.0
 	ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33

    RUN set -ex; \
--- a/arm32v7.dockerfile
+++ b/arm32v7.dockerfile
@@ -6,7 +6,7 @@
 # :: Builder
 	FROM arm32v7/alpine:latest as nginx
    COPY --from=builder qemu-arm-static /usr/bin
-	ENV NGINX_VERSION 1.22.1
+	ENV NGINX_VERSION 1.24.0
 	ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33

    RUN set -ex; \
--- a/arm64v8.dockerfile
+++ b/arm64v8.dockerfile
@@ -6,7 +6,7 @@
 # :: Builder
 	FROM arm64v8/alpine:latest as nginx
    COPY --from=builder qemu-aarch64-static /usr/bin
-	ENV NGINX_VERSION 1.22.1
+	ENV NGINX_VERSION 1.24.0
 	ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33

    RUN set -ex; \
--- a/hooks/post_push
+++ b/hooks/post_push
@@ -1,4 +0,0 @@
-#!/bin/bash
-curl -Lo manifest-tool https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64
-chmod +x manifest-tool
-./manifest-tool push from-spec multi-arch-manifest.yaml
--- a/multi-arch-manifest.yaml
+++ b/multi-arch-manifest.yaml
@@ -1,16 +0,0 @@
-image: 11notes/nginx:stable
-manifests:
-  - image: 11notes/nginx:amd64-1.22.1
-    platform:
-      architecture: amd64
-      os: linux
-  - image: 11notes/nginx:arm64v8-1.22.1
-    platform:
-      architecture: arm64
-      os: linux
-      variant: v8
-  - image: 11notes/nginx:arm32v7-1.22.1
-    platform:
-      architecture: arm
-      os: linux
-      variant: v7
--- a/rootfs/nginx/www/default/index.html
+++ b/rootfs/nginx/www/default/index.html
@@ -43,7 +43,6 @@
        color:darkgreen;
        font-style:italic;
      }
-
    </style>
  </head>
  <body>
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -1,8 +1,8 @@
 #!/bin/ash
-if [ -z "$1" ]; then
+  if [ -z "$1" ]; then
      set -- "nginx" \
          -g \
          'daemon off;'
-fi
+  fi

-exec "$@"
+  exec "$@"
--- a/rootfs/usr/local/bin/healthcheck.sh
+++ b/rootfs/usr/local/bin/healthcheck.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-curl --max-time 5 -kILs --fail http://localhost:8080
+    curl --max-time 5 -kILs --fail http://localhost:8080