diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 67b080ab..d0bfecee 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -31,6 +31,7 @@ jobs: docker_build: name: "Docker build: ${{ matrix.os_flavour }} for ${{ matrix.ps_version }} with ${{ matrix.server_flavour }}" runs-on: ubuntu-latest + timeout-minutes: 10 strategy: fail-fast: false # TODO: Test only should be removed matrix: @@ -50,7 +51,6 @@ jobs: TARGET_PLATFORM: ${{ env.TARGET_PLATFORM }} - name: Test the image - timeout-minutes: 10 run: docker run --rm -t --env PS_DOMAIN='localhost:80' --entrypoint sh $DOCKER_IMAGE -c 'cat VERSION' env: DOCKER_IMAGE: prestashop/prestashop:${{ matrix.ps_version }}-${{ matrix.os_flavour }} diff --git a/docker/debian.Dockerfile b/docker/debian.Dockerfile index e113c1e9..7194d881 100644 --- a/docker/debian.Dockerfile +++ b/docker/debian.Dockerfile @@ -68,7 +68,6 @@ RUN if [ "$SERVER_FLAVOUR" = "apache" ]; then \ && apt-get update \ && apt-get install --no-install-recommends -qqy \ apache2 \ - apache2-proxy \ apache2-utils \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \