diff --git a/.gitignore b/.gitignore index 3cdab39..780225b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -maintain/ \ No newline at end of file +maintain/ +multi-arch-manifest.yaml +post_push \ No newline at end of file diff --git a/amd64.dockerfile b/amd64.dockerfile index a4f0fad..8ee6fb7 100644 --- a/amd64.dockerfile +++ b/amd64.dockerfile @@ -1,6 +1,6 @@ # :: Header - FROM alpine:3.12 - ENV NGINX_VERSION 1.18.0 + FROM alpine:3.16 + ENV NGINX_VERSION 1.22.1 ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33 # :: Run diff --git a/arm32v7.dockerfile b/arm32v7.dockerfile index af1bb35..51ff2b2 100644 --- a/arm32v7.dockerfile +++ b/arm32v7.dockerfile @@ -4,9 +4,9 @@ RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . && mv qemu-3.0.0+resin-arm/qemu-arm-static . # :: Header - FROM arm32v7/alpine:3.12 + FROM arm32v7/alpine:3.16 COPY --from=builder qemu-arm-static /usr/bin - ENV NGINX_VERSION 1.18.0 + ENV NGINX_VERSION 1.22.1 ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33 # :: Run diff --git a/arm64v8.dockerfile b/arm64v8.dockerfile index ce04750..37841fb 100644 --- a/arm64v8.dockerfile +++ b/arm64v8.dockerfile @@ -4,9 +4,9 @@ RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . && mv qemu-3.0.0+resin-aarch64/qemu-aarch64-static . # :: Header - FROM arm64v8/alpine:3.12 + FROM arm64v8/alpine:3.16 COPY --from=builder qemu-aarch64-static /usr/bin - ENV NGINX_VERSION 1.18.0 + ENV NGINX_VERSION 1.22.1 ENV ADD_MODULE_HEADERS_MORE_NGINX_VERSION 0.33 # :: Run diff --git a/multi-arch-manifest.yaml b/multi-arch-manifest.yaml deleted file mode 100644 index 033b9b0..0000000 --- a/multi-arch-manifest.yaml +++ /dev/null @@ -1,16 +0,0 @@ -image: 11notes/nginx:1.18.0 -manifests: - - image: 11notes/nginx:amd64-1.18.0 - platform: - architecture: amd64 - os: linux - - image: 11notes/nginx:arm64v8-1.18.0 - platform: - architecture: arm64 - os: linux - variant: v8 - - image: 11notes/nginx:arm32v7-1.18.0 - platform: - architecture: arm - os: linux - variant: v7 \ No newline at end of file