Update docker-compose.yml.twig (#490)

* Update docker-compose.yml.twig Removing version because of changes in docker version 25.05 * add dynamic version header
spryker · May 8, 2024 · 7d80bc0 · 7d80bc0
1 parent 262eee2
commit 7d80bc0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/bin/command/install/bootstrap.sh b/bin/command/install/bootstrap.sh
@@ -106,11 +106,15 @@ function Command::bootstrap() {
     if [ "${USER_FULL_ID%%:*}" != '0' ]; then
         userToRun=()
     fi
+
+    local dockerVersion=`docker version --format json`
+
     docker run -i --rm "${userToRun[@]}" \
         -e SPRYKER_PLATFORM_IMAGE="${SPRYKER_PLATFORM_IMAGE:-""}" \
         -e SPRYKER_DOCKER_SDK_PLATFORM="${_PLATFORM}" \
         -e SPRYKER_DOCKER_SDK_DEPLOYMENT_DIR="${DESTINATION_DIR}" \
         -e VERBOSE="${VERBOSE}" \
+        -e DOCKER_VERSION="${dockerVersion}" \
         -v "${tmpDeploymentDir}":/data/deployment:rw \
         spryker_docker_sdk
 

diff --git a/generator/index.php b/generator/index.php
@@ -104,6 +104,10 @@ public function setIsActive(bool $isActive): void
 $projectData['secrets'] = buildSecrets($deploymentDir);
 $projectData = buildDefaultCredentials($projectData);
 
+$dockerVersionObject = json_decode(getenv('DOCKER_VERSION', '{}'));
+$skipVersionHeader = version_compare($dockerVersionObject?->Client?->Version, '26.0.0', '>=');
+$projectData['_skipVersionHeader'] = $skipVersionHeader;
+
 // TODO Make it optional in next major
 // Making webdriver as required service for BC reasons
 // todo: waitFor refactoring dependency + document + testing mode

diff --git a/generator/src/templates/docker-compose.yml.twig b/generator/src/templates/docker-compose.yml.twig
@@ -1,4 +1,6 @@
+{% if not _skipVersionHeader %}
 version: "3.7"
+{% endif %}
 
 x-volumes:
   &app-volumes