Browse Source

Revert PHP to ubuntu 20.04 (#6775)

* Revert PHP to ubuntu 20.04

* Import last composer to avoid problem with 20.04

* Add git new composer need it

* Add mbstring to ubiquity-workerman variants
Joan Miquel 4 years ago
parent
commit
55f78e1c13
54 changed files with 99 additions and 99 deletions
  1. 1 1
      frameworks/PHP/amp/amp.dockerfile
  2. 2 2
      frameworks/PHP/cakephp/cakephp.dockerfile
  3. 2 2
      frameworks/PHP/codeigniter/codeigniter.dockerfile
  4. 2 2
      frameworks/PHP/comet/comet-mysql.dockerfile
  5. 2 2
      frameworks/PHP/comet/comet.dockerfile
  6. 2 2
      frameworks/PHP/duckphp/duckphp.dockerfile
  7. 2 2
      frameworks/PHP/fat-free/fat-free-raw.dockerfile
  8. 2 2
      frameworks/PHP/fat-free/fat-free.dockerfile
  9. 2 2
      frameworks/PHP/fuel/fuel.dockerfile
  10. 2 2
      frameworks/PHP/hamlet/hamlet.dockerfile
  11. 1 1
      frameworks/PHP/kumbiaphp/kumbiaphp-raw.dockerfile
  12. 2 2
      frameworks/PHP/kumbiaphp/kumbiaphp-workerman-mysql.dockerfile
  13. 2 2
      frameworks/PHP/kumbiaphp/kumbiaphp-workerman.dockerfile
  14. 1 1
      frameworks/PHP/kumbiaphp/kumbiaphp.dockerfile
  15. 2 2
      frameworks/PHP/laravel/laravel.dockerfile
  16. 2 2
      frameworks/PHP/lumen/lumen.dockerfile
  17. 3 3
      frameworks/PHP/mark/mark.dockerfile
  18. 1 1
      frameworks/PHP/phalcon/phalcon-micro.dockerfile
  19. 1 1
      frameworks/PHP/phalcon/phalcon-mongodb.dockerfile
  20. 1 1
      frameworks/PHP/phalcon/phalcon.dockerfile
  21. 1 1
      frameworks/PHP/php-ngx/php-ngx-async.dockerfile
  22. 1 1
      frameworks/PHP/php-ngx/php-ngx-mysql.dockerfile
  23. 1 1
      frameworks/PHP/php-ngx/php-ngx-pgsql.dockerfile
  24. 1 1
      frameworks/PHP/php-ngx/php-ngx.dockerfile
  25. 2 2
      frameworks/PHP/php/php-eloquent.dockerfile
  26. 1 1
      frameworks/PHP/php/php-h2o.dockerfile
  27. 2 2
      frameworks/PHP/php/php-laravel-query-builder.dockerfile
  28. 1 1
      frameworks/PHP/php/php-pgsql-raw.dockerfile
  29. 1 1
      frameworks/PHP/php/php-pools.dockerfile
  30. 1 1
      frameworks/PHP/php/php-raw7-tcp.dockerfile
  31. 1 1
      frameworks/PHP/php/php.dockerfile
  32. 2 2
      frameworks/PHP/phpixie/phpixie.dockerfile
  33. 1 1
      frameworks/PHP/reactphp/reactphp.dockerfile
  34. 2 2
      frameworks/PHP/slim/slim.dockerfile
  35. 1 1
      frameworks/PHP/symfony/symfony-raw.dockerfile
  36. 1 1
      frameworks/PHP/symfony/symfony.dockerfile
  37. 2 2
      frameworks/PHP/ubiquity/ubiquity-ngx-micro.dockerfile
  38. 2 2
      frameworks/PHP/ubiquity/ubiquity-ngx-raw.dockerfile
  39. 2 2
      frameworks/PHP/ubiquity/ubiquity-ngx.dockerfile
  40. 2 2
      frameworks/PHP/ubiquity/ubiquity-roadrunner-mysql.dockerfile
  41. 2 2
      frameworks/PHP/ubiquity/ubiquity-roadrunner.dockerfile
  42. 3 3
      frameworks/PHP/ubiquity/ubiquity-workerman-mongo.dockerfile
  43. 3 3
      frameworks/PHP/ubiquity/ubiquity-workerman-mysql.dockerfile
  44. 3 3
      frameworks/PHP/ubiquity/ubiquity-workerman-raw.dockerfile
  45. 3 3
      frameworks/PHP/ubiquity/ubiquity-workerman.dockerfile
  46. 2 2
      frameworks/PHP/ubiquity/ubiquity.dockerfile
  47. 3 3
      frameworks/PHP/webman/webman.dockerfile
  48. 3 3
      frameworks/PHP/workerman/workerman-async.dockerfile
  49. 3 3
      frameworks/PHP/workerman/workerman-pgsql.dockerfile
  50. 3 3
      frameworks/PHP/workerman/workerman-php8-jit.dockerfile
  51. 3 3
      frameworks/PHP/workerman/workerman.dockerfile
  52. 2 2
      frameworks/PHP/yii2/yii2-raw.dockerfile
  53. 2 2
      frameworks/PHP/yii2/yii2.dockerfile
  54. 1 1
      frameworks/PHP/zend/zend.dockerfile

+ 1 - 1
frameworks/PHP/amp/amp.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 2 - 2
frameworks/PHP/cakephp/cakephp.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -8,7 +8,7 @@ RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip \
     php8.0-fpm php8.0-mysql php8.0-xml php8.0-mbstring php8.0-intl > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 COPY deploy/conf/* /etc/php/8.0/cli/

+ 2 - 2
frameworks/PHP/codeigniter/codeigniter.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql php8.0-xml php8.0-mbstring php8.0-intl > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 2 - 2
frameworks/PHP/comet/comet-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php8.0-cli php8.0-xml php8.0-mysql  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php-dev libevent-dev > /dev/null
 RUN pecl install event-3.0.4 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini

+ 2 - 2
frameworks/PHP/comet/comet.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php8.0-cli php8.0-pgsql php8.0-xml > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php-dev libevent-dev > /dev/null
 RUN pecl install event-3.0.4 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini

+ 2 - 2
frameworks/PHP/duckphp/duckphp.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -8,7 +8,7 @@ RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip \
     php8.0-cli php8.0-fpm php8.0-mysql  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 2 - 2
frameworks/PHP/fat-free/fat-free-raw.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -14,7 +14,7 @@ WORKDIR /fat-free
 
 ENV F3DIR="/fat-free/src"
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 

+ 2 - 2
frameworks/PHP/fat-free/fat-free.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -15,7 +15,7 @@ WORKDIR /fat-free
 ENV F3DIR="/fat-free/src"
 
 #RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
 #RUN git clone -b 3.7.2 --single-branch --depth 1 "https://github.com/bcosca/fatfree-core.git" src

+ 2 - 2
frameworks/PHP/fuel/fuel.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql php8.0-xml php8.0-mbstring php7.0-mcrypt  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 2 - 2
frameworks/PHP/hamlet/hamlet.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ENV PHP_VERSION 8.0
 ARG DEBIAN_FRONTEND=noninteractive
@@ -9,7 +9,7 @@ RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip curl \
     php${PHP_VERSION}-cli php${PHP_VERSION}-fpm php${PHP_VERSION}-apcu php${PHP_VERSION}-pdo-mysql > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 ADD ./ /app
 WORKDIR /app

+ 1 - 1
frameworks/PHP/kumbiaphp/kumbiaphp-raw.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 2 - 2
frameworks/PHP/kumbiaphp/kumbiaphp-workerman-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq git php8.0-cli php8.0-mysql php8.0-xml > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
 RUN pecl install event-3.0.4 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini

+ 2 - 2
frameworks/PHP/kumbiaphp/kumbiaphp-workerman.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq git php8.0-cli php8.0-pgsql php8.0-xml > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
 RUN pecl install event-3.0.4 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini

+ 1 - 1
frameworks/PHP/kumbiaphp/kumbiaphp.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 2 - 2
frameworks/PHP/laravel/laravel.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -9,7 +9,7 @@ RUN apt-get update -yqq > /dev/null && \
     php8.0-cli php8.0-fpm php8.0-mysql  > /dev/null
 RUN apt-get install -yqq php8.0-mbstring php8.0-xml  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 2 - 2
frameworks/PHP/lumen/lumen.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -9,7 +9,7 @@ RUN apt-get update -yqq > /dev/null && \
     php8.0-cli php8.0-fpm php8.0-mysql  > /dev/null
 RUN apt-get install -yqq php8.0-mbstring php8.0-xml  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 3 - 3
frameworks/PHP/mark/mark.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,9 +7,9 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php8.0-cli php8.0-pgsql php8.0-xml > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
+RUN apt-get install -y php-pear php8.0-dev libevent-dev git > /dev/null
 RUN pecl install event-3.0.2 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
  
 COPY php.ini /etc/php/8.0/cli/php.ini

+ 1 - 1
frameworks/PHP/phalcon/phalcon-micro.dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip \
     php7.4-cli php7.4-fpm php7.4-mysql php7.4-mbstring > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/7.4/fpm/
 

+ 1 - 1
frameworks/PHP/phalcon/phalcon-mongodb.dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip \
         php7.4-cli php7.4-fpm php7.4-mysql php7.4-mbstring php7.4-mongodb > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/7.4/fpm/
 

+ 1 - 1
frameworks/PHP/phalcon/phalcon.dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip \
     php7.4-cli php7.4-fpm php7.4-mysql php7.4-mbstring > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/7.4/fpm/
 

+ 1 - 1
frameworks/PHP/php-ngx/php-ngx-async.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 1 - 1
frameworks/PHP/php-ngx/php-ngx-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 1 - 1
frameworks/PHP/php-ngx/php-ngx-pgsql.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 1 - 1
frameworks/PHP/php-ngx/php-ngx.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 2 - 2
frameworks/PHP/php/php-eloquent.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql  php8.0-mbstring > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 1 - 1
frameworks/PHP/php/php-h2o.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 COPY ./ ./
 

+ 2 - 2
frameworks/PHP/php/php-laravel-query-builder.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql  php8.0-mbstring > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 1 - 1
frameworks/PHP/php/php-pgsql-raw.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 1 - 1
frameworks/PHP/php/php-pools.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 1 - 1
frameworks/PHP/php/php-raw7-tcp.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 1 - 1
frameworks/PHP/php/php.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 2 - 2
frameworks/PHP/phpixie/phpixie.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 1 - 1
frameworks/PHP/reactphp/reactphp.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 2 - 2
frameworks/PHP/slim/slim.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql php8.0-xml > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 1 - 1
frameworks/PHP/symfony/symfony-raw.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 1 - 1
frameworks/PHP/symfony/symfony.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 

+ 2 - 2
frameworks/PHP/ubiquity/ubiquity-ngx-micro.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -28,7 +28,7 @@ RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
             --add-module=/ngx_php7 > /dev/null && \
     make > /dev/null && make install > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN composer config -g repo.packagist composer https://packagist.phpcomposer.com
 

+ 2 - 2
frameworks/PHP/ubiquity/ubiquity-ngx-raw.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -28,7 +28,7 @@ RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
             --add-module=/ngx_php7 > /dev/null && \
     make > /dev/null && make install > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN composer config -g repo.packagist composer https://packagist.phpcomposer.com
 

+ 2 - 2
frameworks/PHP/ubiquity/ubiquity-ngx.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -28,7 +28,7 @@ RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
             --add-module=/ngx_php7 > /dev/null && \
     make > /dev/null && make install > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN composer config -g repo.packagist composer https://packagist.phpcomposer.com
 

+ 2 - 2
frameworks/PHP/ubiquity/ubiquity-roadrunner-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php8.0 php8.0-common php8.0-cgi php-curl php8.0-mysql > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php-dev > /dev/null
 

+ 2 - 2
frameworks/PHP/ubiquity/ubiquity-roadrunner.dockerfile

@@ -1,5 +1,5 @@
   
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -8,7 +8,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php8.0 php8.0-common php8.0-cgi php8.0-pgsql php-curl > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php-dev > /dev/null
 

+ 3 - 3
frameworks/PHP/ubiquity/ubiquity-workerman-mongo.dockerfile

@@ -1,14 +1,14 @@
   
-FROM ubuntu:21.04
+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
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq git php8.0-cli php8.0-mongodb php8.0-xml > /dev/null
+    apt-get install -yqq git php8.0-cli php8.0-mongodb php8.0-xml php8.0-mbstring > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
 RUN pecl install event-3.0.5 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini

+ 3 - 3
frameworks/PHP/ubiquity/ubiquity-workerman-mysql.dockerfile

@@ -1,13 +1,13 @@
-FROM ubuntu:21.04
+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
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq git php8.0-cli php8.0-mysql php8.0-xml > /dev/null
+    apt-get install -yqq git php8.0-cli php8.0-mysql php8.0-xml php8.0-mbstring > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
 RUN pecl install event-3.0.5 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini

+ 3 - 3
frameworks/PHP/ubiquity/ubiquity-workerman-raw.dockerfile

@@ -1,14 +1,14 @@
   
-FROM ubuntu:21.04
+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
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq git php8.0-cli php8.0-pgsql php8.0-xml > /dev/null
+    apt-get install -yqq git php8.0-cli php8.0-pgsql php8.0-xml php8.0-mbstring > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
 RUN pecl install event-3.0.5 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini

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

@@ -1,14 +1,14 @@
   
-FROM ubuntu:21.04
+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
 RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq git php8.0-cli php8.0-pgsql php8.0-xml > /dev/null
+    apt-get install -yqq git php8.0-cli php8.0-pgsql php8.0-xml php8.0-mbstring > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
 RUN pecl install event-3.0.5 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini

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

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 3 - 3
frameworks/PHP/webman/webman.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,9 +7,9 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php8.0-cli php8.0-pgsql php8.0-xml > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
+RUN apt-get install -y php-pear php8.0-dev libevent-dev git > /dev/null
 RUN pecl install event-3.0.4 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
 
 COPY php.ini /etc/php/8.0/cli/php.ini

+ 3 - 3
frameworks/PHP/workerman/workerman-async.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,9 +7,9 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php7.4-cli php7.4-mysql  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get install -y php-pear php7.4-dev libevent-dev > /dev/null
+RUN apt-get install -y php-pear php7.4-dev libevent-dev git > /dev/null
 RUN pecl install event > /dev/null && echo "extension=event.so" > /etc/php/7.4/cli/conf.d/event.ini
 
 COPY php.ini /etc/php/7.4/cli/php.ini

+ 3 - 3
frameworks/PHP/workerman/workerman-pgsql.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,9 +7,9 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php8.0-cli php8.0-pgsql php8.0-xml > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
+RUN apt-get install -y php-pear php8.0-dev libevent-dev git > /dev/null
 RUN pecl install event-3.0.4 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
 
 COPY php.ini /etc/php/8.0/cli/php.ini

+ 3 - 3
frameworks/PHP/workerman/workerman-php8-jit.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,9 +7,9 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php8.0-cli php8.0-pgsql php8.0-xml > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
+RUN apt-get install -y php-pear php8.0-dev libevent-dev git > /dev/null
 RUN pecl install event-3.0.4 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
  
 COPY php-jit.ini /etc/php/8.0/cli/php.ini

+ 3 - 3
frameworks/PHP/workerman/workerman.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,9 +7,9 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq php8.0-cli php8.0-mysql php8.0-xml > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-RUN apt-get install -y php-pear php8.0-dev libevent-dev > /dev/null
+RUN apt-get install -y php-pear php8.0-dev libevent-dev git > /dev/null
 RUN pecl install event-3.0.4 > /dev/null && echo "extension=event.so" > /etc/php/8.0/cli/conf.d/event.ini
  
 COPY php.ini /etc/php/8.0/cli/php.ini

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

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql php8.0-mbstring  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

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

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -7,7 +7,7 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
     apt-get install -yqq nginx git unzip php8.0 php8.0-common php8.0-cli php8.0-fpm php8.0-mysql php8.0-mbstring  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/8.0/fpm/
 

+ 1 - 1
frameworks/PHP/zend/zend.dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update -yqq > /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 php7.4-xml php7.4-mbstring  > /dev/null
 
-RUN apt-get install -yqq composer > /dev/null
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
 COPY deploy/conf/* /etc/php/7.4/fpm/