diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 0c42ccc802..6513903041 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -40,7 +40,7 @@ jobs: fail-fast: false matrix: ${{ fromJSON(needs.ui_test_matrix.outputs.matrix) }} env: - PS_DOCKER: ${{ matrix.IMG_DOCKER }} + PS_DOCKER: ${{ matrix.PS_VERSION_START }}-${{ matrix.PHP_VERSION }} steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index aa89265aff..3e696f99ba 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -7,21 +7,23 @@ "PS_VERSION_START": "1.7.5.0", "PS_VERSION_END": "8.1.7", "UPGRADE_CHANNEL": "major", - "PHP_VERSION": "7.2", - "IMG_DOCKER": "1.7.5.0" + "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.5.1", "PS_VERSION_END": "8.1.7", "UPGRADE_CHANNEL": "major", - "PHP_VERSION": "7.2", - "IMG_DOCKER": "1.7.5.1" + "PHP_VERSION": "7.2" }, { - "comment": "@todo 1.7.5.2" + "PS_VERSION_START": "1.7.5.2", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" }, + { - "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" + "comment": "1.7.8 ~ minor PHP 7.4" }, { "PS_VERSION_START": "1.7.8.10", diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml index b6c3a35b53..6376a42582 100644 --- a/tests/UI/docker-compose.yml +++ b/tests/UI/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: prestashop: - image: prestashop/prestashop:${PS_VERSION} + image: prestashop/prestashop:${PS_VERSION}-apache container_name: prestashop depends_on: - mysql @@ -31,7 +31,7 @@ services: ports: - 80:80 mysql: - image: mariadb:lts + image: mysql:5.7 container_name: prestashop-mysql healthcheck: test: