chore: CI/CD

akafeng · Sep 22, 2023 · 3822e4e · 3822e4e
1 parent e493363
commit 3822e4e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -16,13 +16,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and cache
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           target: builder
           platforms: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,21 +15,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.PACKAGE_REGISTRY }}
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.PACKAGE_REGISTRY }}/${{ github.repository_owner }}/${{ env.REPOSITORY }}
           tags: |
@@ -38,7 +38,7 @@ jobs:
             type=semver, pattern={{version}}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
           platforms: |

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.72.0-slim-bookworm AS builder
+FROM debian:bookworm-slim AS builder
 
 ARG NGINX_VERSION="1.25.2"
 ARG NGINX_GPG_KEY="13C82A63B603576156E30A4EA0EA981B66B0D967"
@@ -10,7 +10,7 @@ ARG NGINX_USE_OPENSSL_CRYPTO_PATCH="https://github.com/kn007/patch/raw/master/us
 
 ARG ZLIB_URL="https://github.com/cloudflare/zlib.git"
 
-ARG OPENSSL_VERSION="1.1.1v"
+ARG OPENSSL_VERSION="1.1.1w"
 ARG OPENSSL_URL="https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz"
 ARG OPENSSL_PATCH="https://github.com/kn007/patch/raw/master/openssl-1.1.1.patch"
 
@@ -22,7 +22,7 @@ ARG LIBATOMIC_URL="https://github.com/ivmai/libatomic_ops/releases/download/v${L
 
 ARG MODULE_BROTLI_URL="https://github.com/google/ngx_brotli.git"
 
-ARG MODULE_STICKY_URL="https://github.com/liberatti/nginx-sticky-module-ng.git"
+ARG MODULE_STICKY_URL="https://github.com/xu2ge/nginx-sticky-module-ng.git"
 
 ARG MODULE_HEADERS_MORE_VERSION="0.34"
 ARG MODULE_HEADERS_MORE_URL="https://github.com/openresty/headers-more-nginx-module/archive/refs/tags/v${MODULE_HEADERS_MORE_VERSION}.tar.gz"
@@ -108,11 +108,6 @@ RUN set -eux \
     \
     # nginx-sticky-module-ng
     && git clone --depth 1 ${MODULE_STICKY_URL} \
-    && ( \
-            # fix SHA_CBLOCK redefined
-            cd nginx-sticky-module-ng; \
-            sed -i '/#define SHA_CBLOCK/d' ngx_http_sticky_misc.c \
-        ) \
     \
     # headers-more-nginx
     && wget -O headers-more-nginx-module-${MODULE_HEADERS_MORE_VERSION}.tar.gz ${MODULE_HEADERS_MORE_URL} \