From 8d32b20ae0a93f8a6527fd187159d9e23ecae9ab Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 18 Dec 2019 12:21:26 +0530 Subject: [PATCH 1/3] Update nginx image version Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img-versions.json b/img-versions.json index e2df4c7e7..a996dd766 100644 --- a/img-versions.json +++ b/img-versions.json @@ -3,7 +3,7 @@ "easyengine/mailhog": "v4.0.0", "easyengine/mariadb": "v4.0.0", "easyengine/nginx-proxy": "v4.0.3", - "easyengine/nginx": "v4.0.3", + "easyengine/nginx": "v4.1.0", "easyengine/php": "v4.1.0", "easyengine/php5.6": "v4.0.0", "easyengine/php7.0": "v4.1.0", From 515ca14d8b568a31daf3d02f6cce486f51403f75 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 18 Dec 2019 12:21:42 +0530 Subject: [PATCH 2/3] Skip downloading of all PHP images by default Signed-off-by: Riddhesh Sanghvi --- ...2850_easyengine_insert_docker_images_version.php | 2 ++ php/EE/Migration/Containers.php | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/migrations/db/20181016052850_easyengine_insert_docker_images_version.php b/migrations/db/20181016052850_easyengine_insert_docker_images_version.php index e2411b6dc..5e752b06c 100644 --- a/migrations/db/20181016052850_easyengine_insert_docker_images_version.php +++ b/migrations/db/20181016052850_easyengine_insert_docker_images_version.php @@ -34,7 +34,9 @@ public function up() { $skip_download = [ 'easyengine/php5.6', 'easyengine/php7.0', + 'easyengine/php7.2', 'easyengine/php7.3', + 'easyengine/php7.4', 'easyengine/newrelic-daemon', ]; foreach ( $images as $image => $tag ) { diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index 44200c365..5a6eea225 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -27,7 +27,20 @@ public static function start_container_migration() { $current_versions = self::get_current_docker_images_versions(); $updated_images = []; + $skip_download = [ + 'easyengine/php5.6', + 'easyengine/php7.0', + 'easyengine/php7.2', + 'easyengine/php7.3', + 'easyengine/php7.4', + 'easyengine/newrelic-daemon', + ]; + foreach ( $img_versions as $img => $version ) { + + if ( in_array( $image, $skip_download ) ) { + continue; + } if ( array_key_exists( $img, $current_versions ) ) { if ( $current_versions[ $img ] !== $version ) { $updated_images[] = $img; From 188b5108144f7b35859760ca5b09af8a4d2388f3 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 18 Dec 2019 12:23:17 +0530 Subject: [PATCH 3/3] Fix variable name typo Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/Containers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index 5a6eea225..9c9e77c4b 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -38,7 +38,7 @@ public static function start_container_migration() { foreach ( $img_versions as $img => $version ) { - if ( in_array( $image, $skip_download ) ) { + if ( in_array( $img, $skip_download ) ) { continue; } if ( array_key_exists( $img, $current_versions ) ) {