Skip to content

Commit

Permalink
ci: Some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Venatum committed Jun 21, 2024
1 parent ab42d55 commit f16cd64
Show file tree
Hide file tree
Showing 2 changed files with 2 additions 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 @@ -51,6 +51,6 @@ jobs:

- name: Test the image
timeout-minutes: 10
run: docker run --rm -t --env PS_DOMAIN='localhost:80' --entrypoint /bin/sh $DOCKER_IMAGE cat VERSION
run: docker run --rm -t --env PS_DOMAIN='localhost:80' --entrypoint bash $DOCKER_IMAGE -c 'cat VERSION'
env:
DOCKER_IMAGE: prestashop/prestashop:${{ matrix.ps_version }}-${{ matrix.os_flavour }}
2 changes: 1 addition & 1 deletion docker/debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ RUN if [ "$SERVER_FLAVOUR" = "apache" ]; then \
apache2-utils \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& wget -O /usr/local/bin/apache2-foreground "https://raw.githubusercontent.com/docker-library/php/master/8.3/bullseye/apache/apache2-foreground" \
&& wget --quiet -O /usr/local/bin/apache2-foreground "https://raw.githubusercontent.com/docker-library/php/master/8.3/bullseye/apache/apache2-foreground" \
&& chmod +x /usr/local/bin/apache2-foreground; \
elif [ "$SERVER_FLAVOUR" = "nginx" ]; then \
export DEBIAN_FRONTEND=noninteractive \
Expand Down

0 comments on commit f16cd64

Please sign in to comment.