fix(ci): use variable php version in docker compose

pheanstalk · Aug 7, 2023 · 6a0328e · 6a0328e
1 parent 62a0586
commit 6a0328e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,11 +19,12 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: sockets pcov
       - name: Install dependencies including dev
         uses: ramsey/composer-install@v2
       - name: Tests
-        run: composer phpunit-native
+        run: composer test
+        env:
+          PHP_VERSION: ${{ matrix.php }}
       - uses: codecov/codecov-action@v3.1.1
         with:
           files: ./tests/coverage/coverage.xml

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,6 +18,8 @@ services:
     build:
       context: ./dockerfiles
       dockerfile: Dockerfile-phpunit
+      args:
+        PHP_VERSION: "${PHP_VERSION:-8.1}"
     environment:
       SERVER_HOST: beanstalk
       UNIX_SERVER_HOST: unix:///shared/beanstalkd.sock

diff --git a/dockerfiles/Dockerfile-phpunit b/dockerfiles/Dockerfile-phpunit
@@ -1,4 +1,5 @@
-FROM php:8.1-cli-alpine
+ARG PHP_VERSION=8.1
+FROM php:${PHP_VERSION}-cli-alpine
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 RUN chmod +x /usr/local/bin/install-php-extensions \
     && sync \