diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7847307..3a211da 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -24,23 +24,23 @@ jobs: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - - name: Build the Docker images ${{ matrix.version }} + - name: Build the Docker images ${{ matrix.php_version }} run: | - DOCKER_BUILDKIT=1 docker build --cache-from=dannecron/php-for-dev:${{ matrix.version }} --build-arg BUILDKIT_INLINE_CACHE=1 --tag=localhost/php-for-dev:${{ matrix.version }} ./v${{ matrix.version }} - docker run --rm localhost/php-for-dev:${{ matrix.version }} php -v - docker tag localhost/php-for-dev:${{ matrix.version }} dannecron/php-for-dev:${{ matrix.version }} + DOCKER_BUILDKIT=1 docker build --cache-from=dannecron/php-for-dev:${{ matrix.php_version }} --build-arg BUILDKIT_INLINE_CACHE=1 --tag=localhost/php-for-dev:${{ matrix.php_version }} ./v${{ matrix.php_version }} + docker run --rm localhost/php-for-dev:${{ matrix.php_version }} php -v + docker tag localhost/php-for-dev:${{ matrix.php_version }} dannecron/php-for-dev:${{ matrix.php_version }} echo "Done" - - name: push ${{ matrix.version }} image to docker hub + - name: push ${{ matrix.php_version }} image to docker hub if: success() uses: actions-hub/docker@master with: - args: push dannecron/php-for-dev:${{ matrix.version }} + args: push dannecron/php-for-dev:${{ matrix.php_version }} - name: tag latest image if: | success() - && ${{ matrix.version }} == 7.4 + && ${{ matrix.php_version }} == 7.4 uses: actions-hub/docker@master with: args: tag dannecron/php-for-dev:7.4 dannecron/php-for-dev:latest @@ -48,7 +48,7 @@ jobs: - name: push latest image to docker hub if: | success() - && ${{ matrix.version }} == 7.4 + && ${{ matrix.php_version }} == 7.4 uses: actions-hub/docker@master with: args: push dannecron/php-for-dev:latest