upgrade nginx 1.24, dev kit, misc...

Author: noogen

Dockerfile

@@ -1,15 +1,15 @@
 FROM ubuntu:22.04 AS buildstep
 ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
-    NGINX_DEVEL_KIT_VERSION=0.3.1 NGINX_SET_MISC_MODULE_VERSION=0.32 \
-    NGINX_VERSION=1.22.0
+    NGINX_DEVEL_KIT_VERSION=0.3.2 NGINX_SET_MISC_MODULE_VERSION=0.33 \
+    NGINX_VERSION=1.24.0
 ADD ./build/ /tmp/
 RUN bash /tmp/ubuntu.sh
 
 
 FROM ubuntu:22.04
 LABEL maintainer="noogen <friends@niiknow.org>"
 ENV TERM=xterm container=docker DEBIAN_FRONTEND=noninteractive \
-    NGINX_VERSION=_1.22.0-1~jammy_amd64.deb \
+    NGINX_VERSION=_1.24.0-1~jammy_amd64.deb \
     NGINX_DEBUG=-dbg${NGINX_VERSION}
 
 COPY --from=buildstep /usr/src/nginx/nginx${NGINX_VERSION} /tmp
@@ -19,10 +19,10 @@ RUN cd /tmp \
     && apt-get update -y && apt-get upgrade -y --no-install-recommends --no-install-suggests \
     && apt-get install -y --no-install-recommends --no-install-suggests curl gpg-agent nano \
        libgd3 gettext-base unzip rsync cron apt-transport-https software-properties-common \
-       ca-certificates libmaxminddb0 libmaxminddb-dev mmdb-bin python3-pip \
+       ca-certificates libmaxminddb0 libmaxminddb-dev mmdb-bin python3-pip git \
     && dpkg --configure -a \
     && touch /var/log/cron.log \
-    && curl -s https://nginx.org/keys/nginx_signing.key | apt-key add - \
+    && curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add - \
     && cp /etc/apt/sources.list /etc/apt/sources.list.bak \
     && echo "deb http://nginx.org/packages/ubuntu/ jammy nginx" | tee -a /etc/apt/sources.list \
     && echo "deb-src http://nginx.org/packages/ubuntu/ jammy nginx" | tee -a /etc/apt/sources.list \

build/ubuntu.sh

@@ -3,11 +3,12 @@
 export NGINX_BUILD_DIR=/usr/src/nginx/nginx-${NGINX_VERSION}
 cd /tmp
 
-add-apt-repository ppa:maxmind/ppa
 apt-get update
 apt-get install -y --no-install-recommends --no-install-suggests curl apt-transport-https \
         apt-utils software-properties-common build-essential ca-certificates libssl-dev \
-        zlib1g zlib1g-dev dpkg-dev libpcre3 libpcre3-dev libgd-dev gpg-agent
+        zlib1g zlib1g-dev dpkg-dev libpcre3 libpcre3-dev libgd-dev gpg-agent git
+        
+add-apt-repository ppa:maxmind/ppa
 apt-get install -y libmaxminddb0 libmaxminddb-dev mmdb-bin
 
 dpkg --configure -a
@@ -22,7 +23,7 @@ mkdir -p /usr/src/nginx/set-misc-nginx-module
 tar -xof ngx-misc.tar.gz -C /usr/src/nginx/set-misc-nginx-module --strip-components=1
 rm ngx-misc.tar.gz
 
-curl -s https://nginx.org/keys/nginx_signing.key | apt-key add -
+curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add -
 cp /etc/apt/sources.list /etc/apt/sources.list.bak
 echo "deb http://nginx.org/packages/ubuntu/ jammy nginx" | tee -a /etc/apt/sources.list
 echo "deb-src http://nginx.org/packages/ubuntu/ jammy nginx" | tee -a /etc/apt/sources.list