Skip to content

Commit 89cabca

Browse files
authored
Merge pull request #1444 from EasyEngine/update/nginx-image
Update nginx image
2 parents baea28b + 188b510 commit 89cabca

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

img-versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"easyengine/mailhog": "v4.0.0",
44
"easyengine/mariadb": "v4.0.0",
55
"easyengine/nginx-proxy": "v4.0.3",
6-
"easyengine/nginx": "v4.0.3",
6+
"easyengine/nginx": "v4.1.0",
77
"easyengine/php": "v4.1.0",
88
"easyengine/php5.6": "v4.0.0",
99
"easyengine/php7.0": "v4.1.0",

migrations/db/20181016052850_easyengine_insert_docker_images_version.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ public function up() {
3434
$skip_download = [
3535
'easyengine/php5.6',
3636
'easyengine/php7.0',
37+
'easyengine/php7.2',
3738
'easyengine/php7.3',
39+
'easyengine/php7.4',
3840
'easyengine/newrelic-daemon',
3941
];
4042
foreach ( $images as $image => $tag ) {

php/EE/Migration/Containers.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,20 @@ public static function start_container_migration() {
2727
$current_versions = self::get_current_docker_images_versions();
2828
$updated_images = [];
2929

30+
$skip_download = [
31+
'easyengine/php5.6',
32+
'easyengine/php7.0',
33+
'easyengine/php7.2',
34+
'easyengine/php7.3',
35+
'easyengine/php7.4',
36+
'easyengine/newrelic-daemon',
37+
];
38+
3039
foreach ( $img_versions as $img => $version ) {
40+
41+
if ( in_array( $img, $skip_download ) ) {
42+
continue;
43+
}
3144
if ( array_key_exists( $img, $current_versions ) ) {
3245
if ( $current_versions[ $img ] !== $version ) {
3346
$updated_images[] = $img;

0 commit comments

Comments
 (0)