Browse Source

[php] Update ngx-php (#8739)

* [php] Update ngx-php

* Less verbose
Joan Miquel 1 year ago
parent
commit
b59569732a

+ 1 - 1
frameworks/PHP/php-ngx/app-async.php

@@ -1,5 +1,5 @@
 <?php
-require_once '/ngx_php7/t/lib/mysql.php';
+require_once '/ngx-php/t/lib/mysql.php';
 
 define('DB_HOST', gethostbyname('tfb-database'));
 define('DB_PORT', '3306');

+ 5 - 5
frameworks/PHP/php-ngx/php-ngx-async.dockerfile

@@ -9,14 +9,14 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
 
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
-                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
+                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev libkrb5-dev \
                     php8.3-cli php8.3-dev libphp8.3-embed php8.3-mysql > /dev/null
 
 ADD . .
 
-ENV NGINX_VERSION 1.25.3
+ENV NGINX_VERSION 1.25.4
 
-RUN git clone -b v0.0.28 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
+RUN git clone -b v0.0.29 --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 && \
@@ -25,8 +25,8 @@ RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
     ./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|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.3/embed/conf.d/10-opcache.ini
 

+ 3 - 3
frameworks/PHP/php-ngx/php-ngx-mysql.dockerfile

@@ -9,13 +9,13 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
 
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
-                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
+                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev libkrb5-dev \
                     php8.3-cli php8.3-dev libphp8.3-embed php8.3-mysql > /dev/null
 ADD . .
 
-ENV NGINX_VERSION 1.25.3
+ENV NGINX_VERSION 1.25.4
 
-RUN git clone -b v0.0.28 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null
+RUN git clone -b v0.0.29 --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 && \

+ 3 - 3
frameworks/PHP/php-ngx/php-ngx-pgsql.dockerfile

@@ -9,13 +9,13 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
 
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
-                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
+                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev libkrb5-dev \
                     php8.3-cli php8.3-dev libphp8.3-embed php8.3-pgsql > /dev/null
 ADD . .
 
-ENV NGINX_VERSION 1.25.3
+ENV NGINX_VERSION 1.25.4
 
-RUN git clone -b v0.0.28 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null
+RUN git clone -b v0.0.29 --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 && \

+ 4 - 4
frameworks/PHP/php-ngx/php-ngx.dockerfile

@@ -9,13 +9,13 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
 
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
-                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
-                    php8.3-cli php8.3-dev libphp8.3-embed php8.3-mysql
+                    zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev libkrb5-dev \
+                    php8.3-cli php8.3-dev libphp8.3-embed php8.3-mysql > /dev/null
 ADD . .
 
-ENV NGINX_VERSION 1.25.3
+ENV NGINX_VERSION 1.25.4
 
-RUN git clone -b v0.0.28 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null
+RUN git clone -b v0.0.29 --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 && \