Browse Source

[php-unit] Update nginx unit to 1.27 and php 8.1 (#7387)

* [php-unit] Update nginx unit to 1.27 and php 8.1

* Clean dockerfile
Joan Miquel 3 years ago
parent
commit
c5da047e7a

+ 1 - 1
frameworks/PHP/php/benchmark_config.json

@@ -104,7 +104,7 @@
       "database": "MySQL",
       "framework": "PHP",
       "language": "PHP",
-      "flavor": "PHP7",
+      "flavor": "PHP8.1",
       "orm": "Raw",
       "platform": "Unit Nginx",
       "webserver": "None",

+ 1 - 1
frameworks/PHP/php/deploy/nginx-unit.json

@@ -7,7 +7,7 @@
 
     "applications": {
         "benchmark": {
-            "type": "php 7",
+            "type": "php",
             "processes": 84,
             "user": "www-data",
             "group": "www-data",

+ 6 - 22
frameworks/PHP/php/php-unit.dockerfile

@@ -1,29 +1,13 @@
-FROM ubuntu:20.04
+FROM nginx/unit:1.27.0-php8.1
 
-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
-RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq curl php-mysql > /dev/null
-
-RUN curl https://nginx.org/keys/nginx_signing.key | apt-key add - \
-    && add-apt-repository "deb https://packages.nginx.org/unit/ubuntu/ focal unit" -s \
-    && apt-get -y update \
-    && apt-get -y install unit unit-php
-
-ADD ./ /php
+ADD . /php
 WORKDIR /php
 
-# forward log to docker log collector
-#RUN ln -sf /dev/stdout /var/log/unit.log
-
-# RUN if [ $(nproc) = 2 ]; then sed -i "s|\"processes\": 128,|\"processes\": 64,|g" /php/deploy/nginx-unit.json ; fi;
+RUN docker-php-ext-install pdo_mysql opcache > /dev/null
+RUN if [ $(nproc) = 2 ]; then sed -i "s|\"processes\": 84,|\"processes\": 64,|g" /php/deploy/nginx-unit.json ; fi;
 
-RUN unitd && \
-    curl -X PUT --data-binary @/php/deploy/nginx-unit.json --unix-socket \
-        /var/run/control.unit.sock http://localhost/config
+COPY deploy/nginx-unit.json /docker-entrypoint.d/nginx-unit.json
 
 EXPOSE 8080
 
-CMD unitd --no-daemon
+CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]