From e814599fd17f276ae6529fa7de35ef70ea406053 Mon Sep 17 00:00:00 2001 From: Vincent Le Quec Date: Thu, 11 Apr 2024 15:14:41 +0200 Subject: [PATCH] ci: Test time --- .github/workflows/pull-request.yml | 2 +- docker/alpine.Dockerfile | 2 +- docker/debian.Dockerfile | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 91b46901..bcda91f0 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -29,7 +29,7 @@ jobs: dockerfile: "*.Dockerfile" docker_build: - name: "Docker build: ${{ matrix.os_flavour }} for ${{ matrix.ps_version }}" + name: "Docker build: ${{ matrix.os_flavour }} for ${{ matrix.ps_version }} with ${{ matrix.server_flavour }}" runs-on: ubuntu-latest strategy: matrix: diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile index c86cc491..40437674 100644 --- a/docker/alpine.Dockerfile +++ b/docker/alpine.Dockerfile @@ -52,7 +52,7 @@ RUN \ # The PrestaShop docker entrypoint COPY ./assets/docker_run.sh /tmp/ -RUN if [[ ${SERVER_FLAVOUR} = *"fpm"* ]]; \ +RUN if [ "$SERVER_FLAVOUR" = "fpm" ]; \ then sed 's/{PHP_CMD}/php-fpm/' /tmp/docker_run.sh; \ else \ sed 's/{PHP_CMD}/apache2-foreground/' /tmp/docker_run.sh; \ diff --git a/docker/debian.Dockerfile b/docker/debian.Dockerfile index 9a891cf1..593aff4f 100644 --- a/docker/debian.Dockerfile +++ b/docker/debian.Dockerfile @@ -62,12 +62,13 @@ RUN export DEBIAN_FRONTEND=noninteractive \ # The PrestaShop docker entrypoint COPY ./assets/docker_run.sh /tmp/ -RUN if [[ ${SERVER_FLAVOUR} = *"fpm"* ]]; \ +RUN if [ "$SERVER_FLAVOUR" = "fpm" ]; \ then sed 's/{PHP_CMD}/php-fpm/' /tmp/docker_run.sh; \ else \ sed 's/{PHP_CMD}/apache2-foreground/' /tmp/docker_run.sh; \ fi + # Handling a dynamic domain # Probably, or at least its usage must be described in the README file # COPY ./assets/docker_updt_ps_domains.php /tmp/