Эх сурвалжийг харах

[php] Fix Nginx Unit (#9037)

* Fix Nginx Unit with PHP

* Clean FrankenPHP Dockerfile

* Clean Unit Dockerfile
Joan Miquel 1 жил өмнө
parent
commit
ee9039bd03

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

@@ -8,7 +8,11 @@
     "applications": {
         "benchmark": {
             "type": "php",
-            "processes": 84,
+            "processes": {
+                "max": 224,
+                "spare": 168,
+                "idle_timeout": 20
+              },
             "user": "www-data",
             "group": "www-data",
             "root": "/php/",
@@ -19,5 +23,10 @@
                 "requests": 10000000
             }
         }
+    },
+    "settings": {
+        "http": {
+          "server_version": false
+        }
     }
 }

+ 4 - 3
frameworks/PHP/php/php-franken.dockerfile

@@ -4,12 +4,13 @@ FROM dunglas/frankenphp
 RUN install-php-extensions \
     pdo_mysql \
     zip \
-    opcache
+    opcache > /dev/null
 
 
-COPY deploy/franken/Caddyfile /etc/caddy/Caddyfile
+COPY --link deploy/franken/Caddyfile /etc/caddy/Caddyfile
+COPY --link deploy/conf/php.ini /usr/local/etc/php/
 
-ADD . /php
+COPY --link . /php
 
 # Worker mode 
 #ENV FRANKENPHP_CONFIG="worker ./public/index.php"

+ 12 - 5
frameworks/PHP/php/php-unit.dockerfile

@@ -1,13 +1,20 @@
 FROM unit:php8.3
 
-ADD . /php
+RUN docker-php-ext-install pdo_mysql opcache > /dev/null
+
 WORKDIR /php
+COPY --link . .
 
-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 if [ $(nproc) = 2 ]; then sed -i "s|\"spare\": 168,|\"spare\": 64,|g" /php/deploy/nginx-unit.json ; fi;
 
-EXPOSE 8080
+#RUN more /php/deploy/nginx-unit.json
 
-COPY deploy/nginx-unit.json /docker-entrypoint.d/nginx-unit.json
+RUN unitd && \
+    curl -X PUT --data-binary @/php/deploy/nginx-unit.json --unix-socket \
+        /var/run/control.unit.sock http://localhost/config
+
+ENTRYPOINT [ ]
+
+EXPOSE 8080
 
 CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]