diff --git a/amd64.dockerfile b/amd64.dockerfile index 1d0f7fd..9ac12ca 100644 --- 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; \ @@ -100,10 +100,10 @@ USER root # :: prepare - RUN set -ex; \ - mkdir -p /nginx; \ - mkdir -p /nginx/etc; \ - mkdir -p /nginx/www; \ + RUN set -ex; \ + mkdir -p /nginx; \ + mkdir -p /nginx/etc; \ + mkdir -p /nginx/www; \ mkdir -p /nginx/ssl; \ mkdir -p /nginx/cache; \ mkdir -p /nginx/run; @@ -124,7 +124,7 @@ adduser --uid 1000 -D -S -h /nginx -s /sbin/nologin -G nginx nginx; # :: copy root filesystem changes - COPY ./rootfs / + COPY ./rootfs / # :: docker -u 1000:1000 (no root initiative) RUN set -ex; \ @@ -136,8 +136,8 @@ VOLUME ["/nginx/etc", "/nginx/www", "/nginx/ssl"] # :: Monitor - RUN set -ex; chmod +x /usr/local/bin/healthcheck.sh - HEALTHCHECK CMD /usr/local/bin/healthcheck.sh || exit 1 + RUN set -ex; chmod +x /usr/local/bin/healthcheck.sh + HEALTHCHECK CMD /usr/local/bin/healthcheck.sh || exit 1 # :: Start RUN set -ex; chmod +x /usr/local/bin/entrypoint.sh diff --git a/arm32v7.dockerfile b/arm32v7.dockerfile index 2c7b7b8..aec9cb3 100644 --- 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; \ diff --git a/arm64v8.dockerfile b/arm64v8.dockerfile index 152317e..e17b157 100644 --- 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; \ diff --git a/hooks/post_push b/hooks/post_push deleted file mode 100644 index 2903347..0000000 --- a/hooks/post_push +++ /dev/null @@ -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 \ No newline at end of file diff --git a/multi-arch-manifest.yaml b/multi-arch-manifest.yaml deleted file mode 100644 index d9538ab..0000000 --- a/multi-arch-manifest.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/rootfs/nginx/etc/default.conf b/rootfs/nginx/etc/default.conf index 9aecd5e..71503f8 100644 --- a/rootfs/nginx/etc/default.conf +++ b/rootfs/nginx/etc/default.conf @@ -1,9 +1,9 @@ server { - listen 8080 default_server; - server_name _; - root /nginx/www/default; + listen 8080 default_server; + server_name _; + root /nginx/www/default; - location / { - try_files $uri /index.html; - } + location / { + try_files $uri /index.html; + } } \ No newline at end of file diff --git a/rootfs/nginx/www/default/index.html b/rootfs/nginx/www/default/index.html index a8e9744..a350b8b 100644 --- a/rootfs/nginx/www/default/index.html +++ b/rootfs/nginx/www/default/index.html @@ -1,62 +1,61 @@ - - 11notes/nginx:stable - + + 11notes/nginx:stable + - - -
-
-
- docker run --name nginx \
-  -v volume-etc:/nginx/etc \
-  -v volume-www:/nginx/www \
-  -v volume-ssl:/nginx/ssl:ro \
-  -d 11notes/nginx:[tag] -
-
-
- + + +
+
+
+ docker run --name nginx \
+  -v volume-etc:/nginx/etc \
+  -v volume-www:/nginx/www \
+  -v volume-ssl:/nginx/ssl:ro \
+  -d 11notes/nginx:[tag] +
+
+
+ \ No newline at end of file diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index 2b74bce..54b5ceb 100644 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -1,8 +1,8 @@ #!/bin/ash -if [ -z "$1" ]; then - set -- "nginx" \ - -g \ - 'daemon off;' -fi + if [ -z "$1" ]; then + set -- "nginx" \ + -g \ + 'daemon off;' + fi -exec "$@" \ No newline at end of file + exec "$@" \ No newline at end of file diff --git a/rootfs/usr/local/bin/healthcheck.sh b/rootfs/usr/local/bin/healthcheck.sh index 18cd294..296be27 100644 --- 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 \ No newline at end of file + curl --max-time 5 -kILs --fail http://localhost:8080 \ No newline at end of file