update nginx

Author: sawanoboly

Dockerfile

@@ -1,20 +1,21 @@
-FROM alpine:3.12
+FROM alpine:3.17
+ARG TARGETARCH=arm64
 LABEL [email protected]
 
 # https://github.com/cubicdaiya/nginx-build
-ENV NGINX_BUILD=0.11.13
-ENV NGINX_VER=1.21.0
-ENV ZLIB_VERSION=1.2.11
+ENV NGINX_BUILD=0.13.1
+ENV NGINX_VER=1.23.3
+ENV ZLIB_VERSION=1.2.13
 
 RUN mkdir /usr/local/src /usr/local/share/GeoIP
 ADD config /config
 
 WORKDIR /usr/local/src
 RUN apk add --update openssl-dev git curl geoip-dev file wget \
   && apk add --virtual build-deps build-base ruby-rake bison perl \
-  && curl -L https://github.com/cubicdaiya/nginx-build/releases/download/v$NGINX_BUILD/nginx-build-linux-amd64-$NGINX_BUILD.tar.gz -o nginx-build.tar.gz \
+  && curl -L https://github.com/cubicdaiya/nginx-build/releases/download/v$NGINX_BUILD/nginx-build-linux-${TARGETARCH}-$NGINX_BUILD.tar.gz -o nginx-build.tar.gz \
   && tar xvzf nginx-build.tar.gz \
-  && ./nginx-build -verbose -v $NGINX_VER -d work -pcre -zlib -zlibversion=$ZLIB_VERSION -m /config/modules3rd.ini -c /config/configure.sh --clear \
+  && ./nginx-build -verbose -v $NGINX_VER -d work -pcre -zlib -zlibversion=$ZLIB_VERSION -m /config/modules3rd.json -c /config/configure.sh --clear \
   && cd work/nginx/$NGINX_VER/nginx-$NGINX_VER \
   && make install \
   && apk del build-deps \

config/configure.sh

@@ -17,7 +17,5 @@
  --with-stream \
  --with-stream_ssl_module \
  --without-stream_limit_conn_module \
- --add-module=../ngx_mruby/dependence/ngx_devel_kit \
- --with-cc-opt='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic' \
- --with-ld-opt='-Wl,-z,relro'
+ --add-module=../ngx_mruby/dependence/ngx_devel_kit
 

config/modules3rd.ini

@@ -6,6 +6,6 @@ rev=2.3
 [ngx_mruby]
 form=git
 url=https://github.com/matsumotory/ngx_mruby.git
-rev=v2.2.3
+rev=v2.3.0
 shprov=/config/mruby/wrap_build.sh
 

config/modules3rd.json

@@ -0,0 +1,15 @@
+[
+  {
+    "name": "ngx_cache_purge",
+    "form": "git",
+    "url": "https://github.com/FRiCKLE/ngx_cache_purge.git",
+    "rev": "2.3"
+  },
+  {
+    "name": "ngx_mruby",
+    "form": "git",
+    "url": "https://github.com/matsumotory/ngx_mruby.git",
+    "rev": "v2.3.0",
+    "shprov": "/config/mruby/wrap_build.sh"
+  }
+]

config/mruby/build_config.rb

@@ -16,7 +16,7 @@
   conf.gem :github => 'mattn/mruby-onig-regexp'
   conf.gem :github => 'matsumoto-r/mruby-redis'
   conf.gem :github => 'matsumoto-r/mruby-vedis'
-  conf.gem :github => 'matsumoto-r/mruby-sleep'
+  # conf.gem :github => 'matsumoto-r/mruby-sleep'
   conf.gem :github => 'matsumoto-r/mruby-userdata'
   conf.gem :github => 'matsumoto-r/mruby-uname'
   conf.gem :github => 'matsumoto-r/mruby-mutex'