Skip to content

Commit 626c26f

Browse files
Merge pull request #95 from mrrobot47/update/img-versions
Get image versions from utils
2 parents 72f322f + c520a4e commit 626c26f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ci/prepare.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ rm ee
1010
cd ..
1111
git clone https://github.com/EasyEngine/easyengine.git easyengine --depth=1
1212
cd easyengine
13-
echo 'travis_test' > VERSION
1413

1514
# Copy tests to EE repo
1615
rm -r features

src/Site_Docker.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ class Site_Docker {
1212
* @return String docker-compose.yml content string.
1313
*/
1414
public function generate_docker_compose_yml( array $filters = [] ) {
15-
$base = [];
15+
$img_versions = EE\Utils\get_image_versions();
16+
$base = [];
1617

1718
$restart_default = [ 'name' => 'always' ];
1819
$network_default = [ 'name' => 'site-network' ];
1920

2021
// nginx configuration.
2122
$nginx['service_name'] = [ 'name' => 'nginx' ];
22-
$nginx['image'] = [ 'name' => 'easyengine/nginx:v' . EE_VERSION ];
23+
$nginx['image'] = [ 'name' => 'easyengine/nginx:' . $img_versions['easyengine/nginx'] ];
2324
$nginx['restart'] = $restart_default;
2425

2526
$v_host = 'VIRTUAL_HOST';

0 commit comments

Comments
 (0)