update nginx version to 1.25.4

jungsoft · Mar 20, 2024 · 1470d95 · 1470d95
1 parent 53cc346
commit 1470d95
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 28 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -2,34 +2,27 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-      -
-        name: Login to Docker Hub
+      - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Git Checkout
+      - name: Git Checkout
         uses: actions/checkout@v2
-      -
-        name: Docker Setup QEMU
+      - name: Docker Setup QEMU
         uses: docker/[email protected]
-      -
-        uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v1
         id: buildx
         with:
           install: true
-      -
-        name: Build and push with Buildx
-        run: docker build --platform linux/amd64,linux/arm64 . --tag jungsoft/alpine-nginx-forward-proxy --tag jungsoft/alpine-nginx-forward-proxy:1.25.3 --push
+      - name: Build and push with Buildx
+        run: docker build --platform linux/amd64,linux/arm64 . --tag jungsoft/alpine-nginx-forward-proxy --tag jungsoft/alpine-nginx-forward-proxy:1.25.4 --push
diff --git a/Dockerfile b/Dockerfile
@@ -1,25 +1,25 @@
 FROM alpine:3.16
 
-ENV NGINX_VERSION 1.25.3
+ENV NGINX_VERSION 1.25.4
 
 RUN apk update && apk add curl gettext bash
 RUN apk add --virtual nginx \
-      alpine-sdk openssl-dev pcre-dev zlib-dev tinyproxy git patch
+  alpine-sdk openssl-dev pcre-dev zlib-dev tinyproxy git patch
 
 WORKDIR /tmp
 
 RUN curl -LSs http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz -O                                             && \
-    tar xf nginx-${NGINX_VERSION}.tar.gz                                                                             && \
-    cd     nginx-${NGINX_VERSION}                                                                                    && \
-    git clone https://github.com/chobits/ngx_http_proxy_connect_module                                               && \
-    patch -p1 < ./ngx_http_proxy_connect_module/patch/proxy_connect_rewrite_102101.patch                             && \
-    ./configure                                                                                                         \
-      --add-module=./ngx_http_proxy_connect_module                                                                      \
-      --sbin-path=/usr/sbin/nginx                                                                                       \
-      --with-cc-opt='-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fPIC' && \
-    make -j $(nproc)                                                                                                 && \
-    make install                                                                                                     && \
-    rm -rf /tmp/*
+  tar xf nginx-${NGINX_VERSION}.tar.gz                                                                             && \
+  cd     nginx-${NGINX_VERSION}                                                                                    && \
+  git clone https://github.com/chobits/ngx_http_proxy_connect_module                                               && \
+  patch -p1 < ./ngx_http_proxy_connect_module/patch/proxy_connect_rewrite_102101.patch                             && \
+  ./configure                                                                                                         \
+  --add-module=./ngx_http_proxy_connect_module                                                                      \
+  --sbin-path=/usr/sbin/nginx                                                                                       \
+  --with-cc-opt='-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fPIC' && \
+  make -j $(nproc)                                                                                                 && \
+  make install                                                                                                     && \
+  rm -rf /tmp/*
 
 # RUN apk del nginx