Browse Source

Update yii2 and ubiquity to php 7.4 (#5331)

* Update yii2 to php 7.4

* Update ubiquity to php 7.4
Joan Miquel 5 years ago
parent
commit
e571979d3b

+ 3 - 3
frameworks/PHP/ubiquity/ubiquity-swoole.dockerfile

@@ -1,13 +1,13 @@
-FROM php:7.3
+FROM php:7.4
 
 
-RUN apt-get update
+RUN apt-get update > /dev/null
 
 
 RUN pecl install swoole-4.4.7 > /dev/null && \
 RUN pecl install swoole-4.4.7 > /dev/null && \
     docker-php-ext-enable swoole
     docker-php-ext-enable swoole
 
 
 RUN apt-get install -y libpq-dev \
 RUN apt-get install -y libpq-dev \
     && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
     && docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
-    && docker-php-ext-install pdo pdo_pgsql pgsql
+    && docker-php-ext-install pdo pdo_pgsql pgsql > /dev/null
 
 
 COPY deploy/conf/php-async.ini /usr/local/etc/php/
 COPY deploy/conf/php-async.ini /usr/local/etc/php/
 
 

+ 4 - 4
frameworks/PHP/ubiquity/ubiquity-workerman.dockerfile

@@ -1,19 +1,19 @@
   
   
-FROM ubuntu:19.04
+FROM ubuntu:19.10
 
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 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 LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq php7.3 php7.3-common php7.3-cli php7.3-pgsql > /dev/null
+    apt-get install -yqq php7.4 php7.4-common php7.4-cli php7.4-pgsql > /dev/null
 
 
 RUN apt-get install -yqq composer > /dev/null
 RUN apt-get install -yqq composer > /dev/null
 
 
 RUN apt-get install -y php-pear php-dev libevent-dev > /dev/null
 RUN apt-get install -y php-pear php-dev libevent-dev > /dev/null
-RUN printf "\n\n /usr/lib/x86_64-linux-gnu/\n\n\nno\n\n\n" | pecl install event > /dev/null && echo "extension=event.so" > /etc/php/7.3/cli/conf.d/event.ini
+RUN printf "\n\n /usr/lib/x86_64-linux-gnu/\n\n\nno\n\n\n" | pecl install event > /dev/null && echo "extension=event.so" > /etc/php/7.4/cli/conf.d/event.ini
 
 
-COPY deploy/conf/php-async.ini /etc/php/7.3/cli/php.ini
+COPY deploy/conf/php-async.ini /etc/php/7.4/cli/php.ini
 
 
 ADD ./ /ubiquity
 ADD ./ /ubiquity
 WORKDIR /ubiquity
 WORKDIR /ubiquity

+ 5 - 5
frameworks/PHP/ubiquity/ubiquity.dockerfile

@@ -1,24 +1,24 @@
-FROM ubuntu:19.04
+FROM ubuntu:19.10
 
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 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 LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php7.3 php7.3-common php7.3-cli php7.3-fpm php7.3-mysql  > /dev/null
+    apt-get install -yqq nginx git unzip php7.4 php7.4-common php7.4-cli php7.4-fpm php7.4-mysql  > /dev/null
 
 
 RUN apt-get install -yqq composer > /dev/null
 RUN apt-get install -yqq composer > /dev/null
 
 
-COPY deploy/conf/* /etc/php/7.3/fpm/
+COPY deploy/conf/* /etc/php/7.4/fpm/
 
 
 ADD ./ /ubiquity
 ADD ./ /ubiquity
 WORKDIR /ubiquity
 WORKDIR /ubiquity
 
 
-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;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.4/fpm/php-fpm.conf ; fi;
 
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 
 RUN chmod 777 -R /ubiquity/app/cache/*
 RUN chmod 777 -R /ubiquity/app/cache/*
 
 
-CMD service php7.3-fpm start && \
+CMD service php7.4-fpm start && \
     nginx -c /ubiquity/deploy/nginx.conf -g "daemon off;"
     nginx -c /ubiquity/deploy/nginx.conf -g "daemon off;"

+ 5 - 5
frameworks/PHP/yii2/yii2-raw.dockerfile

@@ -1,22 +1,22 @@
-FROM ubuntu:19.04
+FROM ubuntu:19.10
 
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 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 LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php7.3 php7.3-common php7.3-cli php7.3-fpm php7.3-mysql php7.3-mbstring  > /dev/null
+    apt-get install -yqq nginx git unzip php7.4 php7.4-common php7.4-cli php7.4-fpm php7.4-mysql php7.4-mbstring  > /dev/null
 
 
 RUN apt-get install -yqq composer > /dev/null
 RUN apt-get install -yqq composer > /dev/null
 
 
-COPY deploy/conf/* /etc/php/7.3/fpm/
+COPY deploy/conf/* /etc/php/7.4/fpm/
 
 
 ADD ./ /yii2
 ADD ./ /yii2
 WORKDIR /yii2
 WORKDIR /yii2
 
 
-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;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.4/fpm/php-fpm.conf ; fi;
 
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 
-CMD service php7.3-fpm start && \
+CMD service php7.4-fpm start && \
     nginx -c /yii2/deploy/nginx-fpm.conf -g "daemon off;"
     nginx -c /yii2/deploy/nginx-fpm.conf -g "daemon off;"

+ 5 - 5
frameworks/PHP/yii2/yii2.dockerfile

@@ -1,22 +1,22 @@
-FROM ubuntu:19.04
+FROM ubuntu:19.10
 
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 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 LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq nginx git unzip php7.3 php7.3-common php7.3-cli php7.3-fpm php7.3-mysql php7.3-mbstring  > /dev/null
+    apt-get install -yqq nginx git unzip php7.4 php7.4-common php7.4-cli php7.4-fpm php7.4-mysql php7.4-mbstring  > /dev/null
 
 
 RUN apt-get install -yqq composer > /dev/null
 RUN apt-get install -yqq composer > /dev/null
 
 
-COPY deploy/conf/* /etc/php/7.3/fpm/
+COPY deploy/conf/* /etc/php/7.4/fpm/
 
 
 ADD ./ /yii2
 ADD ./ /yii2
 WORKDIR /yii2
 WORKDIR /yii2
 
 
-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;
+RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.4/fpm/php-fpm.conf ; fi;
 
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 
 
-CMD service php7.3-fpm start && \
+CMD service php7.4-fpm start && \
     nginx -c /yii2/deploy/nginx-fpm.conf -g "daemon off;"
     nginx -c /yii2/deploy/nginx-fpm.conf -g "daemon off;"