Skip to content

Commit a2bcf43

Browse files
committed
Merge branch 'develop' for v4.0.12
2 parents 62427d3 + c1af5fc commit a2bcf43

File tree

5 files changed

+66
-58
lines changed

5 files changed

+66
-58
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.11
1+
4.0.12

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
"php": ">=7.0",
2828
"composer/composer": "1.7.3",
2929
"composer/semver": "1.4.2",
30-
"easyengine/admin-tools-command": "v1.0.6",
30+
"easyengine/admin-tools-command": "v1.0.8",
3131
"easyengine/auth-command": "v1.0.2",
3232
"easyengine/config-command": "v1.0.2",
3333
"easyengine/cron-command": "v1.0.2",
3434
"easyengine/log-command": "v1.0.1",
3535
"easyengine/mailhog-command": "v1.0.2",
3636
"easyengine/site-command": "v2.3.1",
37-
"easyengine/site-type-wp": "v1.0.9",
38-
"easyengine/site-type-php": "v1.0.9",
37+
"easyengine/site-type-wp": "v1.0.10",
38+
"easyengine/site-type-php": "v1.0.10",
3939
"easyengine/service-command": "v1.0.9",
4040
"easyengine/shell-command" : "v1.0.3",
4141
"justinrainbow/json-schema": "5.2.7",

composer.lock

Lines changed: 53 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

img-versions.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"easyengine/nginx": "v4.0.0",
77
"easyengine/php": "v4.0.2",
88
"easyengine/php5.6": "v4.0.0",
9+
"easyengine/php7.0": "v4.0.0",
10+
"easyengine/php7.3": "v4.0.0",
911
"easyengine/postfix": "v4.0.0",
1012
"easyengine/redis": "v4.0.0",
1113
"easyengine/newrelic-daemon": "v4.0.0"

migrations/db/20181016052850_easyengine_insert_docker_images_version.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,14 @@ public function up() {
3131
$images = EE\Utils\get_image_versions();
3232

3333
$query = '';
34+
$skip_download = [
35+
'easyengine/php5.6',
36+
'easyengine/php7.0',
37+
'easyengine/php7.3',
38+
'easyengine/newrelic-daemon',
39+
];
3440
foreach ( $images as $image => $tag ) {
35-
if ( 'easyengine/php5.6' === $image ) {
41+
if ( in_array( $image, $skip_download ) ) {
3642
continue;
3743
}
3844
EE::log( "Checking and Pulling docker image $image:$tag" );

0 commit comments

Comments
 (0)