From a3ba448516a4e61e9d2a228bddaf7211723124cd Mon Sep 17 00:00:00 2001 From: Jonathan Lelievre Date: Fri, 23 Feb 2024 11:26:39 +0100 Subject: [PATCH] Fix docker env variable for version 8 --- .github/action.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/action.yml b/.github/action.yml index bbfad5ac68..62333cb1fa 100644 --- a/.github/action.yml +++ b/.github/action.yml @@ -6,11 +6,10 @@ runs: - name: Build docker compose stack env: VERSION: ${{ matrix.from }} + BASE_VERSION: ${{ startsWith(matrix.from, '1.6') && '7.1-apache' || startsWith(matrix.from, '8.') && '8.1-apache' || '7.2-apache' }} shell: bash run: | - bash -c 'if [[ "${VERSION}" == 1.6* ]]; then export BASE_VERSION=7.1-apache; \ - elif [[ "${VERSION}" == 8.* ]]; then export BASE_VERSION=8.1-apache; \ - else export BASE_VERSION=7.2-apache; fi && docker compose up -d' + docker compose up -d bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} http://localhost:8001/index.php)" != "200" ]]; do sleep 5; done' - name: Copy autoupgrade module shell: bash