ci: Test time

PrestaShopCorp · Apr 11, 2024 · e814599 · e814599
1 parent 68de351
commit e814599
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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/