Skip to content

Commit

Permalink
ci: Fix debian apache
Browse files Browse the repository at this point in the history
  • Loading branch information
Venatum committed Jun 21, 2024
1 parent 669e6c9 commit 3717aac
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
1 change: 0 additions & 1 deletion docker/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/* \
Expand Down

0 comments on commit 3717aac

Please sign in to comment.