From 63554335cf088701806b8ea7443ccd7470785e0a Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 10 Aug 2018 15:54:59 +0530 Subject: [PATCH 1/2] Get image versions from utils Signed-off-by: Riddhesh Sanghvi --- src/Site_Docker.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Site_Docker.php b/src/Site_Docker.php index d025914c..5eabd87e 100644 --- a/src/Site_Docker.php +++ b/src/Site_Docker.php @@ -12,14 +12,15 @@ class Site_Docker { * @return String docker-compose.yml content string. */ public function generate_docker_compose_yml( array $filters = [] ) { - $base = []; + $img_versions = EE\Utils\get_image_versions(); + $base = []; $restart_default = [ 'name' => 'always' ]; $network_default = [ 'name' => 'site-network' ]; // nginx configuration. $nginx['service_name'] = [ 'name' => 'nginx' ]; - $nginx['image'] = [ 'name' => 'easyengine/nginx:v' . EE_VERSION ]; + $nginx['image'] = [ 'name' => 'easyengine/nginx:' . $img_versions['easyengine/nginx'] ]; $nginx['restart'] = $restart_default; $v_host = 'VIRTUAL_HOST'; From c6ff8ac53c41fca655cc86525623aa28f9d57997 Mon Sep 17 00:00:00 2001 From: Riddhesh Sanghvi Date: Fri, 10 Aug 2018 16:07:38 +0530 Subject: [PATCH 2/2] Remove version change in travis for docker-images Signed-off-by: Riddhesh Sanghvi --- ci/prepare.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/prepare.sh b/ci/prepare.sh index 399d6e9c..3535cfce 100755 --- a/ci/prepare.sh +++ b/ci/prepare.sh @@ -10,7 +10,6 @@ rm ee cd .. git clone https://github.com/EasyEngine/easyengine.git easyengine --depth=1 cd easyengine -echo 'travis_test' > VERSION # Copy tests to EE repo rm -r features