Merge pull request #132 from nanasess/use-debian-archive

Use debian archive
nanasess · Sep 17, 2023 · 7835aac · 7835aac
2 parents 0b47729 + 07ac6e3
commit 7835aac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -113,6 +113,7 @@ jobs:
             GD_OPTIONS=${{ env.GD_OPTIONS }}
             EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }}
             APCU=${{ env.APCU }}
+            FORCE_YES=${{ env.FORCE_YES }}
             APT_REPO=${{ env.APT_REPO }}
             APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}
 
@@ -160,6 +161,9 @@ jobs:
             GD_OPTIONS=${{ env.GD_OPTIONS }}
             EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }}
             APCU=${{ env.APCU }}
+            FORCE_YES=${{ env.FORCE_YES }}
+            APT_REPO=${{ env.APT_REPO }}
+            APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}
 
       - name: Upload evidence
         if: failure()

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -162,7 +162,7 @@ jobs:
         sudo chown -R 1001:1000 zap
         sudo chmod -R g+w zap
         sh -c 'echo "<?php" >> data/config/config.php'
-        docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU} APT_REPO=${{ env.APT_REPO }} APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}" .
+        docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU} --build-arg FORCE_YES="${FORCE_YES}" --build_arg APT_REPO="${APT_REPO} --build_arg APT_SECURITY_REPO=${APT_SECURITY_REPO}" .
         docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:${PHP_VERSION_TAG}-apache
         TAG=${PHP_VERSION_TAG}-apache docker-compose up -d