diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 4628ab5..f2c53ca 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -14,46 +14,7 @@ env: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} jobs: - nginx-125: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: docker/setup-qemu-action@v3 - with: - platforms: amd64,arm64 - - uses: docker/setup-buildx-action@v3 - - uses: ./.github/actions - with: - version: '1.25.5' - tags: 1.25,1,latest - platform: linux/amd64,linux/arm64 - nginx-124: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: docker/setup-qemu-action@v3 - with: - platforms: amd64,arm64 - - uses: docker/setup-buildx-action@v3 - - uses: ./.github/actions - with: - version: '1.24.0' - tags: 1.24 - platform: linux/amd64,linux/arm64 - nginx-123: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: docker/setup-qemu-action@v3 - with: - platforms: amd64,arm64 - - uses: docker/setup-buildx-action@v3 - - uses: ./.github/actions - with: - version: '1.23.4' - tags: 1.23 - platform: linux/amd64,linux/arm64 - nginx-122: + nginx-126: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -63,36 +24,10 @@ jobs: - uses: docker/setup-buildx-action@v3 - uses: ./.github/actions with: - version: '1.22.1' - tags: '1.22' + version: '1.26.0' + tags: 1.26,1,latest platform: linux/amd64,linux/arm64 - nginx-121: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: docker/setup-qemu-action@v3 - with: - platforms: amd64,arm64 - - uses: docker/setup-buildx-action@v3 - - uses: ./.github/actions - with: - version: '1.21.6' - tags: '1.21' - platform: linux/amd64,linux/arm64 - nginx-120: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: docker/setup-qemu-action@v3 - with: - platforms: amd64,arm64 - - uses: docker/setup-buildx-action@v3 - - uses: ./.github/actions - with: - version: '1.20.2' - tags: '1.20' - platform: linux/amd64,linux/arm64 - nginx-119: + nginx-125: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -102,6 +37,6 @@ jobs: - uses: docker/setup-buildx-action@v3 - uses: ./.github/actions with: - version: '1.19.10' - tags: 1.19 + version: '1.25.5' + tags: '1.25' platform: linux/amd64,linux/arm64 diff --git a/Dockerfile b/Dockerfile index 7c6d4d9..25c5751 100755 --- a/Dockerfile +++ b/Dockerfile @@ -120,14 +120,7 @@ RUN set -ex; \ patch -p1 -i "/tmp/patches/${NGINX_VER%.*}/uploadprogress.patch"; \ fi; \ \ - # Keys were changed since 1.22. - if [[ "${NGINX_VER}" == 1.19* || "${NGINX_VER}" == 1.20* || "${NGINX_VER}" == 1.21* ]]; then \ - export GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8; \ - elif [[ "${NGINX_VER}" == 1.22* || "${NGINX_VER}" == 1.23* || "${NGINX_VER}" == 1.24* ]]; then \ - export GPG_KEYS=13C82A63B603576156E30A4EA0EA981B66B0D967; \ - else \ - export GPG_KEYS=43387825DDB1BB97EC36BA5D007C8D7C15D87369; \ - fi; \ + export GPG_KEYS=43387825DDB1BB97EC36BA5D007C8D7C15D87369; \ # Get VTS module \ git clone https://github.com/vozlt/nginx-module-vts.git /tmp/nginx_module_vts; \ cd /tmp/nginx_module_vts; \ diff --git a/Makefile b/Makefile index 2a288eb..59503d8 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -include env_make -NGINX_VER ?= 1.25.5 +NGINX_VER ?= 1.26.0 NGINX_MINOR_VER ?= $(shell echo "${NGINX_VER}" | grep -oE '^[0-9]+\.[0-9]+') TAG ?= $(NGINX_MINOR_VER) -ALPINE_VER ?= 3.18 +ALPINE_VER ?= 3.19 PLATFORM ?= linux/amd64 diff --git a/README.md b/README.md index 1078341..0983e24 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ ## Docker Images -❗For better reliability we release images with stability tags (`wodby/nginx:1.21-X.X.X`) which correspond +❗For better reliability we release images with stability tags (`wodby/nginx:1.26-X.X.X`) which correspond to [git tags](https://github.com/wodby/nginx/releases). We strongly recommend using images only with stability tags. Overview: @@ -38,13 +38,8 @@ Overview: Supported tags and respective `Dockerfile` links: -- `1.25`, `1`, `latest` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile) -- `1.24` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile) -- `1.23` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile) -- `1.22` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile) -- `1.21` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile) -- `1.20` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile) -- `1.19` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile) +- `1.26`, `1`, `latest` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile) +- `1.25` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile) All images built for `linux/amd64` and `linux/arm64`