From 4b57436f6e2a7c504d7543d7cfd1ce77ae30d54f Mon Sep 17 00:00:00 2001 From: dannc Date: Tue, 7 May 2024 11:58:30 +0700 Subject: [PATCH] fix image building --- .github/workflows/continuous-integration.yml | 2 +- Makefile | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 93b0d64..c686d7d 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -43,7 +43,7 @@ jobs: --platform=linux/amd64,linux/arm64 \ --build-arg BUILDKIT_INLINE_CACHE=1 \ --build-arg COMPOSER_VERSION=${{ env.COMPOSER_VERSION }} \ - --build-arg XDEBUG_VERSION=${{ env.XDEBUG_VERSION }} \ + --build-arg PHP_XDEBUG_VERSION=${{ env.XDEBUG_VERSION }} \ --cache-from="type=registry,ref=dannecron/php-for-dev:${{ matrix.php_version }}.cache,mode=max" \ --cache-to="type=registry,ref=dannecron/php-for-dev:${{ matrix.php_version }}.cache,mode=max" \ --tag=dannecron/php-for-dev:${{ matrix.php_version }} \ diff --git a/Makefile b/Makefile index 3b87cae..1380bf3 100644 --- a/Makefile +++ b/Makefile @@ -2,22 +2,22 @@ include .env build-72: - cd ./v7.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.2 `pwd` + cd ./v7.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.2 `pwd` build-73: - cd ./v7.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.3 `pwd` + cd ./v7.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.3 `pwd` build-74: - cd ./v7.4 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.4 `pwd` + cd ./v7.4 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.4 `pwd` build-80: - cd ./v8.0 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.0 `pwd` + cd ./v8.0 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.0 `pwd` build-81: - cd ./v8.1 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.1 `pwd` + cd ./v8.1 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.1 `pwd` build-82: - cd ./v8.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.2 `pwd` + cd ./v8.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.2 `pwd` build-83: - cd ./v8.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.3 `pwd` + cd ./v8.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.3 `pwd`