From 97b6a02f7a776c5da1771a963f76ba603d13b9bd Mon Sep 17 00:00:00 2001 From: Tim Nolte Date: Fri, 8 Dec 2023 23:59:05 -0500 Subject: [PATCH] fix: Cleans up GHA Workflow & Fixes Container Image Copy for Digest - Removes GHA steps that are not needed. - Fixes the generated image container copy to pull the the correct source. - Lists the tagged images stored in the container-storage during test builds. --- .github/workflows/release-build.yml | 13 +++---------- .github/workflows/test-build.yml | 16 +++++++--------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 6a9b2e1..e064b5c 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -70,15 +70,6 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} logout: false - # https://github.com/marketplace/actions/docker-metadata-action - - name: Docker Metadata - uses: docker/metadata-action@v5 - id: metadata - with: - images: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ env.PACKAGE }} - tags: type=raw,value=php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }} - flavor: suffix=-${{ matrix.platform }} - # https://github.com/marketplace/actions/setup-node-js-environment - name: Setup Node Environment uses: actions/setup-node@v4 @@ -86,9 +77,11 @@ jobs: node-version-file: '.nvmrc' # https://github.com/marketplace/actions/dev-container-build-and-run-action - - name: Pre-build dev container image + - name: Pre-build Dev Container Image uses: devcontainers/ci@v0.3 env: + # see: https://github.com/devcontainers/ci/issues/191#issuecomment-1603857155 + BUILDX_NO_DEFAULT_ATTESTATIONS: true PHP_VERSION: ${{ matrix.PHP_VERSION }} NODE_VERSION: ${{ matrix.NODE_VERSION }} with: diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 29320d1..7af0e29 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -62,14 +62,6 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} logout: false - # https://github.com/marketplace/actions/docker-metadata-action - - uses: docker/metadata-action@v5 - id: metadata - with: - images: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ env.PACKAGE }} - tags: type=raw,value=php-${{ matrix.PHP_VERSION }}-node-${{ matrix.NODE_VERSION }} - flavor: suffix=-${{ matrix.platform }} - # https://github.com/marketplace/actions/setup-node-js-environment - name: Setup Node Environment uses: actions/setup-node@v4 @@ -77,9 +69,11 @@ jobs: node-version-file: '.nvmrc' # https://github.com/marketplace/actions/dev-container-build-and-run-action - - name: Pre-build dev container image + - name: Pre-build Dev Container Image uses: devcontainers/ci@v0.3 env: + # see: https://github.com/devcontainers/ci/issues/191#issuecomment-1603857155 + BUILDX_NO_DEFAULT_ATTESTATIONS: true PHP_VERSION: ${{ matrix.PHP_VERSION }} NODE_VERSION: ${{ matrix.NODE_VERSION }} with: @@ -90,3 +84,7 @@ jobs: push: never skipContainerUserIdUpdate: true + - name: List Containers in Storage + run: | + skopeo list-tags containers-storage:${{ env.REGISTRY }}/${{ env.OWNER }}/${{ env.PACKAGE }} +