[php] Ngx-php update Nginx v1.23.4 (TechEmpower#8109)

* [php] Ngx-php update to Nginx v1.23.4 * Remove bash * Revert repo for async * Hide build log
franz1981 · Jun 23, 2023 · 0501e87 · 0501e87
1 parent 29ab79e
commit 0501e87
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 30 deletions.
diff --git a/frameworks/PHP/php-ngx/php-ngx-async.dockerfile b/frameworks/PHP/php-ngx/php-ngx-async.dockerfile
@@ -3,25 +3,26 @@ FROM ubuntu:20.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
+
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq wget git unzip libxml2-dev cmake make systemtap-sdt-dev \
-                zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
-                php8.1-cli php8.1-dev libphp8.1-embed php8.1-mysql nginx > /dev/null
+    apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
+                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
+                    php8.1-cli php8.1-dev libphp8.1-embed php8.1-mysql > /dev/null
 
 ADD . .
 
-ENV NGINX_VERSION 1.23.3
+ENV NGINX_VERSION 1.23.4
 
 RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
 
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
     cd nginx-${NGINX_VERSION} && \
     export PHP_LIB=/usr/lib && \
-    bash ./configure --user=www --group=www \
+    ./configure --user=www --group=www \
             --prefix=/nginx \
             --with-ld-opt="-Wl,-rpath,$PHP_LIB" \
             --add-module=/ngx_php7/third_party/ngx_devel_kit \

diff --git a/frameworks/PHP/php-ngx/php-ngx-mysql.dockerfile b/frameworks/PHP/php-ngx/php-ngx-mysql.dockerfile
@@ -3,29 +3,29 @@ FROM ubuntu:20.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
+
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq wget git unzip libxml2-dev cmake make systemtap-sdt-dev \
-                zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
-                php8.1-cli php8.1-dev libphp8.1-embed php8.1-mysql nginx > /dev/null
-
+    apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
+                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
+                    php8.1-cli php8.1-dev libphp8.1-embed php8.1-mysql > /dev/null
 ADD . .
 
-ENV NGINX_VERSION 1.23.3
+ENV NGINX_VERSION 1.23.4
 
-RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
+RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null
 
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
     cd nginx-${NGINX_VERSION} && \
     export PHP_LIB=/usr/lib && \
-    bash ./configure --user=www --group=www \
+    ./configure --user=www --group=www \
             --prefix=/nginx \
             --with-ld-opt="-Wl,-rpath,$PHP_LIB" \
-            --add-module=/ngx_php7/third_party/ngx_devel_kit \
-            --add-module=/ngx_php7 > /dev/null && \
+            --add-module=/ngx-php/third_party/ngx_devel_kit \
+            --add-module=/ngx-php > /dev/null && \
     make > /dev/null && make install > /dev/null
 
 RUN export WORKERS=$(( 4 * $(nproc) )) && \

diff --git a/frameworks/PHP/php-ngx/php-ngx-pgsql.dockerfile b/frameworks/PHP/php-ngx/php-ngx-pgsql.dockerfile
@@ -3,29 +3,29 @@ FROM ubuntu:20.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
+
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq wget git unzip libxml2-dev cmake make systemtap-sdt-dev \
-                zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
-                php8.1-cli php8.1-dev libphp8.1-embed php8.1-pgsql nginx > /dev/null
-
+    apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
+                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
+                    php8.1-cli php8.1-dev libphp8.1-embed php8.1-pgsql > /dev/null
 ADD . .
 
-ENV NGINX_VERSION 1.23.3
+ENV NGINX_VERSION 1.23.4
 
-RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
+RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null
 
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
     cd nginx-${NGINX_VERSION} && \
     export PHP_LIB=/usr/lib && \
-    bash ./configure --user=www --group=www \
+    ./configure --user=www --group=www \
             --prefix=/nginx \
             --with-ld-opt="-Wl,-rpath,$PHP_LIB" \
-            --add-module=/ngx_php7/third_party/ngx_devel_kit \
-            --add-module=/ngx_php7 > /dev/null && \
+            --add-module=/ngx-php/third_party/ngx_devel_kit \
+            --add-module=/ngx-php > /dev/null && \
     make > /dev/null && make install > /dev/null
 
 RUN sed -i "s|app.php|app-pg.php|g" /deploy/nginx.conf

diff --git a/frameworks/PHP/php-ngx/php-ngx.dockerfile b/frameworks/PHP/php-ngx/php-ngx.dockerfile
@@ -8,24 +8,24 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
     apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
 
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq wget git unzip libxml2-dev cmake make systemtap-sdt-dev \
+    apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
                     zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
-                    php8.1-cli php8.1-dev libphp8.1-embed php8.1-mysql nginx > /dev/null
+                    php8.1-cli php8.1-dev libphp8.1-embed php8.1-mysql > /dev/null
 ADD . .
 
-ENV NGINX_VERSION 1.23.3
+ENV NGINX_VERSION 1.23.4
 
-RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
+RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null
 
 RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
     tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
     cd nginx-${NGINX_VERSION} && \
     export PHP_LIB=/usr/lib && \ 
-    bash ./configure --user=www --group=www \
+    ./configure --user=www --group=www \
             --prefix=/nginx \
             --with-ld-opt="-Wl,-rpath,$PHP_LIB" \
-            --add-module=/ngx_php7/third_party/ngx_devel_kit \
-            --add-module=/ngx_php7 > /dev/null && \
+            --add-module=/ngx-php/third_party/ngx_devel_kit \
+            --add-module=/ngx-php > /dev/null && \
     make > /dev/null && make install > /dev/null
 
 EXPOSE 8080