diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 7530d63afc..592bcf81e7 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -36,7 +36,7 @@ jobs: echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} - - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }} + - if: ${{ matrix.php == 5.5 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} @@ -44,6 +44,14 @@ jobs: echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} + - if: ${{ matrix.php == 5.6 }} + run: | + echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} + echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} + echo "APCU=" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php == 7.0 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} @@ -51,7 +59,7 @@ jobs: echo "APCU=apcu" >> ${GITHUB_ENV} echo "FORCE_YES=" >> ${GITHUB_ENV} echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index eacef8bfcb..3f15f1646e 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -113,7 +113,7 @@ jobs: echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} - - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }} + - if: ${{ matrix.php == 5.5 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} @@ -121,6 +121,14 @@ jobs: echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} + - if: ${{ matrix.php == 5.6 }} + run: | + echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} + echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} + echo "APCU=" >> ${GITHUB_ENV} + echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV} + echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php == 7.0 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} @@ -128,7 +136,7 @@ jobs: echo "APCU=apcu" >> ${GITHUB_ENV} echo "FORCE_YES=" >> ${GITHUB_ENV} echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV} + echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV} - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }} run: | echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV} diff --git a/Dockerfile b/Dockerfile index a5b6a7c8b2..bff7982e1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ ARG APT_SECURITY_REPO="security.debian.org" RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi +RUN if [ ! -e /etc/apt/sources.list ]; then touch /etc/apt/sources.list; fi # for bookworm RUN sed -i s,deb.debian.org,${APT_REPO},g /etc/apt/sources.list; RUN sed -i s,security.debian.org,${APT_SECURITY_REPO},g /etc/apt/sources.list; RUN sed -i s,httpredir.debian.org,${APT_REPO},g /etc/apt/sources.list; # for jessie