Explorar o código

[php] Ngx-php update dockerfiles and Nginx v1.23.3 (#7818)

* [php] Ngx-php update and change name to show

* Update nginx version and dockerfiles

* Fix problem without update
Joan Miquel %!s(int64=2) %!d(string=hai) anos
pai
achega
b21282709c

+ 4 - 4
frameworks/PHP/php-ngx/benchmark_config.json

@@ -16,7 +16,7 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "PHP-ngx",
+      "display_name": "ngx-php",
       "notes": "ngx_php",
       "versus": "php"
     },
@@ -37,7 +37,7 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "PHP-ngx-mysql",
+      "display_name": "ngx-php mysql",
       "notes": "ngx_php",
       "versus": "php"
     },
@@ -58,7 +58,7 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "PHP-ngx-Postgres",
+      "display_name": "ngx-php Postgres",
       "notes": "ngx_php Postgres",
       "versus": "php"
     },
@@ -79,7 +79,7 @@
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "PHP-ngx-async",
+      "display_name": "ngx-php async",
       "notes": "ngx_php async",
       "versus": "php"
     }

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

@@ -3,15 +3,17 @@ 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
+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
+                zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
+                php8.1-cli php8.1-dev libphp8.1-embed php8.1-mysql nginx > /dev/null
 
-ADD ./ ./
+ADD . .
 
-ENV NGINX_VERSION 1.21.6
+ENV NGINX_VERSION 1.23.3
 
 RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
 

+ 7 - 5
frameworks/PHP/php-ngx/php-ngx-mysql.dockerfile

@@ -3,15 +3,17 @@ 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
+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
+                zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
+                php8.1-cli php8.1-dev libphp8.1-embed php8.1-mysql nginx > /dev/null
 
-ADD ./ ./
+ADD . .
 
-ENV NGINX_VERSION 1.21.6
+ENV NGINX_VERSION 1.23.3
 
 RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
 

+ 7 - 5
frameworks/PHP/php-ngx/php-ngx-pgsql.dockerfile

@@ -3,15 +3,17 @@ 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
+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
+                zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
+                php8.1-cli php8.1-dev libphp8.1-embed php8.1-pgsql nginx > /dev/null
 
-ADD ./ ./
+ADD . .
 
-ENV NGINX_VERSION 1.21.6
+ENV NGINX_VERSION 1.23.3
 
 RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
 

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

@@ -3,14 +3,17 @@ 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
+
+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
-ADD ./ ./
+ADD . .
 
-ENV NGINX_VERSION 1.21.6
+ENV NGINX_VERSION 1.23.3
 
 RUN git clone -b v0.0.26 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null