Sfoglia il codice sorgente

Updated Unit to php7.3 (#4990)

Joan Miquel 6 anni fa
parent
commit
127ef6fb3b
1 ha cambiato i file con 18 aggiunte e 4 eliminazioni
  1. 18 4
      frameworks/PHP/php/php-unit.dockerfile

+ 18 - 4
frameworks/PHP/php/php-unit.dockerfile

@@ -1,13 +1,27 @@
-FROM nginx/unit:1.9.0-php7.0
+FROM ubuntu:19.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
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq php7.0-mysql > /dev/null
+    apt-get install -yqq curl php7.3 php7.3-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/ disco unit" -s \
+    && apt-get -y update \
+    && apt-get -y install unit unit-php
 
 ADD ./ /php
 WORKDIR /php
 
-# RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.3/fpm/php-fpm.conf ; fi;
+# forward log to docker log collector
+#RUN ln -sf /dev/stdout /var/log/unit.log
 
-RUN unitd --control unix:/var/run/control.unit.sock && \
+# RUN if [ $(nproc) = 2 ]; then sed -i "s|\"processes\": 128,|\"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
+
+CMD unitd --no-daemon