From af4a663d7c7a0aae5b37b0542d32bc69af30ffa0 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 21 Nov 2018 17:31:46 +0530 Subject: [PATCH 1/3] Add php5.6 image version Signed-off-by: Riddhesh Sanghvi --- img-versions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/img-versions.json b/img-versions.json index e591450b3..3d9ee513f 100644 --- a/img-versions.json +++ b/img-versions.json @@ -5,6 +5,7 @@ "easyengine/nginx-proxy": "v4.0.0", "easyengine/nginx": "v4.0.0", "easyengine/php": "v4.0.0", + "easyengine/php5.6": "v4.0.0", "easyengine/postfix": "v4.0.0", "easyengine/redis": "v4.0.0" } From 8bff8e0a757751fe0c67bb0ee1388e8ad9902c63 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 21 Nov 2018 19:16:09 +0530 Subject: [PATCH 2/3] Skip pulling of 5.6 image temporarily Signed-off-by: Riddhesh Sanghvi --- .../20181016052850_easyengine_insert_docker_images_version.php | 3 +++ php/EE/Migration/Containers.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/migrations/db/20181016052850_easyengine_insert_docker_images_version.php b/migrations/db/20181016052850_easyengine_insert_docker_images_version.php index 80f20c3af..5a8674327 100644 --- a/migrations/db/20181016052850_easyengine_insert_docker_images_version.php +++ b/migrations/db/20181016052850_easyengine_insert_docker_images_version.php @@ -32,6 +32,9 @@ public function up() { $query = ''; foreach ( $images as $image => $tag ) { + if ( 'easyengine/php5.6' === $image ) { + continue; + } EE::log( "Checking and Pulling docker image $image:$tag" ); if ( ! \EE::exec( "docker pull ${image}:${tag}", true, true ) ) { throw new \Exception( "Unable to pull ${image}:${tag}. Please check logs for more details." ); diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index 271156058..88a3e6e1a 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -30,6 +30,9 @@ public static function start_container_migration() { foreach ( $img_versions as $img => $version ) { if ( $current_versions[ $img ] !== $version ) { $updated_images[] = $img; + if ( 'easyengine/php5.6' === $img ) { + continue; + } self::pull_or_error( $img, $version ); } } From 6891a702e0e97122b77935bafc4cc19d290e8049 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Wed, 21 Nov 2018 19:33:27 +0530 Subject: [PATCH 3/3] Update 5.6 image check Signed-off-by: Riddhesh Sanghvi --- php/EE/Migration/Containers.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/php/EE/Migration/Containers.php b/php/EE/Migration/Containers.php index 88a3e6e1a..cf881acc1 100644 --- a/php/EE/Migration/Containers.php +++ b/php/EE/Migration/Containers.php @@ -28,11 +28,11 @@ public static function start_container_migration() { $updated_images = []; foreach ( $img_versions as $img => $version ) { + if ( 'easyengine/php5.6' === $img ) { + continue; + } if ( $current_versions[ $img ] !== $version ) { $updated_images[] = $img; - if ( 'easyengine/php5.6' === $img ) { - continue; - } self::pull_or_error( $img, $version ); } }