Force modern docker version everywhere

PrestaShop · Oct 2, 2023 · e581dee · e581dee
1 parent 8afdcee
commit e581dee
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/actions/run-tests/action.yml b/.github/workflows/actions/run-tests/action.yml
@@ -37,7 +37,7 @@ runs:
         PS_DEV_MODE: ${{ fromJson(inputs.ps_mode_dev) && '1' || '0' }}
         PHP_VERSION: ${{ inputs.php_version }}
         NODE_VERSION: ${{ inputs.node_version }}
-        VERSION: ${{ inputs.php_version }}-apache
+        VERSION: ${{ format('{0}{1}', inputs.php_version, '-apache') }}
         PS_DOMAIN: ${{ (startsWith(inputs.repository_ref, '8.0') || startsWith(inputs.repository_ref, '1.7')) && 'localhost:8001' || 'localhost:8002' }}
         PS_ENABLE_SSL: ${{ (startsWith(inputs.repository_ref, '8.0') || startsWith(inputs.repository_ref, '1.7')) && '0' || '1' }}
         ADMIN_PASSWD: ${{ startsWith(inputs.repository_ref, '1.7') && 'prestashop_demo' || 'Correct Horse Battery Staple' }}

diff --git a/.github/workflows/build-shop.yml b/.github/workflows/build-shop.yml
@@ -50,8 +50,6 @@ jobs:
       PS_DEV_MODE: ${{ inputs.ps_mode_dev && '1' || '0' }}
       PHP_VERSION: ${{ inputs.php_version }}
       NODE_VERSION: ${{ inputs.node_version }}
-      # In 1.7 versions the docker parent name is built the same way so only PHP version is set, in following versions we append -apache
-      #VERSION: ${{ (startsWith(inputs.repository_ref, '1.7')) && inputs.php_version || format('{0}{1}', inputs.php_version, '-apache') }}
       VERSION: ${{ format('{0}{1}', inputs.php_version, '-apache') }}
       PS_DOMAIN: ${{ (startsWith(inputs.repository_ref, '8.0') || startsWith(inputs.repository_ref, '1.7')) && 'localhost:8001' || 'localhost:8002' }}
       PS_ENABLE_SSL: ${{ (startsWith(inputs.repository_ref, '8.0') || startsWith(inputs.repository_ref, '1.7')) && '0' || '1' }}

diff --git a/.github/workflows/test-sanity.yml b/.github/workflows/test-sanity.yml
@@ -46,8 +46,7 @@ jobs:
       PS_DEV_MODE: ${{ inputs.ps_mode_dev && '1' || '0' }}
       PHP_VERSION: ${{ inputs.php_version }}
       NODE_VERSION: ${{ inputs.node_version }}
-      # In 1.7 versions the docker parent name is built the same way so only PHP version is set, in following versions we append -apache
-      VERSION: ${{ (startsWith(inputs.repository_ref, '1.7')) && inputs.php_version || format('{0}{1}', inputs.php_version, '-apache') }}
+      VERSION: ${{ format('{0}{1}', inputs.php_version, '-apache') }}
       PS_DOMAIN: ${{ (startsWith(inputs.repository_ref, '8.0') || startsWith(inputs.repository_ref, '1.7')) && 'localhost:8001' || 'localhost:8002' }}
       PS_ENABLE_SSL: ${{ (startsWith(inputs.repository_ref, '8.0') || startsWith(inputs.repository_ref, '1.7')) && '0' || '1' }}
       ADMIN_PASSWD: ${{ startsWith(inputs.repository_ref, '1.7') && 'prestashop_demo' || 'Correct Horse Battery Staple' }}

diff --git a/.github/workflows/test-with-prebuilt-shop.yml b/.github/workflows/test-with-prebuilt-shop.yml
@@ -43,8 +43,7 @@ jobs:
       PS_DEV_MODE: ${{ inputs.ps_mode_dev && '1' || '0' }}
       PHP_VERSION: ${{ inputs.php_version }}
       NODE_VERSION: ${{ inputs.node_version }}
-      # In 1.7 versions the docker parent name is built the same way so only PHP version is set, in following versions we append -apache
-      VERSION: ${{ (startsWith(inputs.repository_ref, '1.7')) && inputs.php_version || format('{0}{1}', inputs.php_version, '-apache') }}
+      VERSION: ${{ format('{0}{1}', inputs.php_version, '-apache') }}
       PS_DOMAIN: ${{ (startsWith(inputs.repository_ref, '8.0') || startsWith(inputs.repository_ref, '1.7')) && 'localhost:8001' || 'localhost:8002' }}
       PS_ENABLE_SSL: ${{ (startsWith(inputs.repository_ref, '8.0') || startsWith(inputs.repository_ref, '1.7')) && '0' || '1' }}
       ADMIN_PASSWD: ${{ startsWith(inputs.repository_ref, '1.7') && 'prestashop_demo' || 'Correct Horse Battery Staple' }}

diff --git a/.github/workflows/upgrade-shop.yml b/.github/workflows/upgrade-shop.yml
@@ -46,8 +46,7 @@ jobs:
       PS_DEV_MODE: ${{ inputs.ps_mode_dev && '1' || '0' }}
       PHP_VERSION: ${{ inputs.php_version }}
       NODE_VERSION: ${{ inputs.node_version }}
-      # In 1.7 versions the docker parent name is built the same way so only PHP version is set, in following versions we append -apache
-      VERSION: ${{ (startsWith(inputs.repository_ref, '1.7')) && inputs.php_version || format('{0}{1}', inputs.php_version, '-apache') }}
+      VERSION: ${{ format('{0}{1}', inputs.php_version, '-apache') }}
       PS_DOMAIN: ${{ (startsWith(inputs.source_ref, '8.0') || startsWith(inputs.source_ref, '1.7')) && 'localhost:8001' || 'localhost:8002' }}
       PS_ENABLE_SSL: ${{ (startsWith(inputs.source_ref, '8.0') || startsWith(inputs.source_ref, '1.7')) && '0' || '1' }}
       ADMIN_PASSWD: ${{ startsWith(inputs.source_ref, '1.7') && 'prestashop_demo' || 'Correct Horse Battery Staple' }}