Skip to content

Commit

Permalink
fix: Cleans up GHA Workflow & Fixes Container Image Copy for Digest
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
timnolte committed Dec 9, 2023
1 parent 692f4eb commit 97b6a02
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 19 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,18 @@ 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
with:
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/[email protected]
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:
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,18 @@ 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
with:
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/[email protected]
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:
Expand All @@ -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 }}

0 comments on commit 97b6a02

Please sign in to comment.