From 83d79f740a76364fa36caf20b8f0e44edd333569 Mon Sep 17 00:00:00 2001 From: Mike Schroder Date: Tue, 7 Apr 2020 13:31:16 +0900 Subject: [PATCH] Add `rsync` dependency to php Dockerfile Adds `rsync` to all PHP Dockerfiles to allow core TravisCI to successfuly submit results of tests to the distributed hosting tests. See: /WordPress/wpdev-docker-images/issues/22 --- images/5.2/php/Dockerfile | 2 +- images/5.3/php/Dockerfile | 2 +- images/5.4/php/Dockerfile | 2 +- images/5.5/php/Dockerfile | 2 +- images/5.6.20/php/Dockerfile | 2 +- images/5.6/php/Dockerfile | 2 +- images/7.0/php/Dockerfile | 2 +- images/7.1/php/Dockerfile | 2 +- images/7.2/php/Dockerfile | 2 +- images/7.3/php/Dockerfile | 2 +- images/7.4/php/Dockerfile | 2 +- images/8.0/php/Dockerfile | 2 +- update.php | 24 ++++++++++++------------ 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/images/5.2/php/Dockerfile b/images/5.2/php/Dockerfile index f7048bb..be80389 100644 --- a/images/5.2/php/Dockerfile +++ b/images/5.2/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends sudo; + apt-get install -y --no-install-recommends sudo rsync; COPY entrypoint.sh /entrypoint.sh COPY common.sh /common.sh diff --git a/images/5.3/php/Dockerfile b/images/5.3/php/Dockerfile index ff2598f..fa799ed 100644 --- a/images/5.3/php/Dockerfile +++ b/images/5.3/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends unzip sudo git; \ + apt-get install -y --no-install-recommends unzip sudo rsync git; \ \ curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \ curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \ diff --git a/images/5.4/php/Dockerfile b/images/5.4/php/Dockerfile index c879e0a..2c4b1ac 100644 --- a/images/5.4/php/Dockerfile +++ b/images/5.4/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libicu-dev libonig-dev locales sudo git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libicu-dev libonig-dev locales sudo rsync git; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ diff --git a/images/5.5/php/Dockerfile b/images/5.5/php/Dockerfile index 01ff01d..a69dd14 100644 --- a/images/5.5/php/Dockerfile +++ b/images/5.5/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libicu-dev libonig-dev locales sudo git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libicu-dev libonig-dev locales sudo rsync git; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ diff --git a/images/5.6.20/php/Dockerfile b/images/5.6.20/php/Dockerfile index e1f4076..813e5bb 100644 --- a/images/5.6.20/php/Dockerfile +++ b/images/5.6.20/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libicu-dev libonig-dev locales sudo git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libicu-dev libonig-dev locales sudo rsync git; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ diff --git a/images/5.6/php/Dockerfile b/images/5.6/php/Dockerfile index 84927e7..f4f773a 100644 --- a/images/5.6/php/Dockerfile +++ b/images/5.6/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ diff --git a/images/7.0/php/Dockerfile b/images/7.0/php/Dockerfile index 3eabd31..efc3806 100644 --- a/images/7.0/php/Dockerfile +++ b/images/7.0/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ diff --git a/images/7.1/php/Dockerfile b/images/7.1/php/Dockerfile index 8537132..5459255 100644 --- a/images/7.1/php/Dockerfile +++ b/images/7.1/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ diff --git a/images/7.2/php/Dockerfile b/images/7.2/php/Dockerfile index 89cfeb7..5ebb129 100644 --- a/images/7.2/php/Dockerfile +++ b/images/7.2/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ diff --git a/images/7.3/php/Dockerfile b/images/7.3/php/Dockerfile index 77e12d1..8603f69 100644 --- a/images/7.3/php/Dockerfile +++ b/images/7.3/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ diff --git a/images/7.4/php/Dockerfile b/images/7.4/php/Dockerfile index 284b580..f1e7b80 100644 --- a/images/7.4/php/Dockerfile +++ b/images/7.4/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo git; \ + apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync git; \ sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \ locale-gen; \ \ diff --git a/images/8.0/php/Dockerfile b/images/8.0/php/Dockerfile index 82b449c..d95eab1 100644 --- a/images/8.0/php/Dockerfile +++ b/images/8.0/php/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex; \ \ apt-get update; \ \ - apt-get install -y --no-install-recommends unzip sudo git; \ + apt-get install -y --no-install-recommends unzip sudo rsync git; \ \ docker-php-ext-install mysqli; \ \ diff --git a/update.php b/update.php index 07f01e4..8079dbb 100644 --- a/update.php +++ b/update.php @@ -26,7 +26,7 @@ '5.2' => array( 'php' => array( 'base_name' => 'devilbox/php-fpm-5.2:latest', - 'apt' => array( 'sudo' ), + 'apt' => array( 'sudo', 'rsync' ), 'extensions' => array(), 'pecl_extensions' => array(), 'composer' => false, @@ -37,7 +37,7 @@ '5.3' => array( 'php' => array( 'base_name' => 'devilbox/php-fpm-5.3:latest', - 'apt' => array( 'unzip', 'sudo' ), + 'apt' => array( 'unzip', 'sudo', 'rsync' ), 'extensions' => array(), 'pecl_extensions' => array(), 'composer' => true, @@ -51,7 +51,7 @@ '5.4' => array( 'php' => array( 'base_name' => 'php:5.4-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libicu-dev', 'libonig-dev', 'locales', 'sudo' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libicu-dev', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'mysql', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array( 'xdebug-2.4.1', 'memcached-2.2.0', 'imagick-3.4.4' ), 'composer' => true, @@ -65,7 +65,7 @@ '5.5' => array( 'php' => array( 'base_name' => 'php:5.5-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libicu-dev', 'libonig-dev', 'locales', 'sudo' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libicu-dev', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'mysql', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array( 'xdebug-2.5.5', 'memcached-2.2.0', 'imagick-3.4.4' ), 'composer' => true, @@ -79,7 +79,7 @@ '5.6.20' => array( // WordPress' minumum PHP requirement as of WordPress 5.3. 'php' => array( 'base_name' => 'php:5.6.20-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libicu-dev', 'libonig-dev', 'locales', 'sudo' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libicu-dev', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'mysql', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array( 'xdebug-2.5.5', 'memcached-2.2.0', 'imagick-3.4.4' ), 'composer' => true, @@ -93,7 +93,7 @@ '5.6' => array( 'php' => array( 'base_name' => 'php:5.6-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'mysql', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array( 'xdebug-2.5.5', 'memcached-2.2.0', 'imagick-3.4.4' ), 'composer' => true, @@ -107,7 +107,7 @@ '7.0' => array( 'php' => array( 'base_name' => 'php:7.0-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array( 'xdebug-2.7.2', 'memcached-3.1.3', 'imagick' ), 'composer' => true, @@ -121,7 +121,7 @@ '7.1' => array( 'php' => array( 'base_name' => 'php:7.1-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array( 'xdebug-2.7.2', 'memcached-3.1.3', 'imagick' ), 'composer' => true, @@ -135,7 +135,7 @@ '7.2' => array( 'php' => array( 'base_name' => 'php:7.2-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array( 'xdebug-2.7.2', 'memcached-3.1.3', 'imagick' ), 'composer' => true, @@ -149,7 +149,7 @@ '7.3' => array( 'php' => array( 'base_name' => 'php:7.3-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array( 'xdebug-2.7.2', 'memcached-3.1.3', 'imagick' ), 'composer' => true, @@ -163,7 +163,7 @@ '7.4' => array( 'php' => array( 'base_name' => 'php:7.4-rc-fpm', - 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo' ), + 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), 'pecl_extensions' => array( 'xdebug-2.8.0beta1', 'memcached-3.1.3', 'imagick' ), 'composer' => true, @@ -177,7 +177,7 @@ '8.0' => array( 'php' => array( 'base_name' => 'devilbox/php-fpm-8.0:latest', - 'apt' => array( 'unzip', 'sudo' ), + 'apt' => array( 'unzip', 'sudo', 'rsync' ), 'extensions' => array( 'mysqli' ), 'pecl_extensions' => array(), 'composer' => true,