Skip to content

Use Docker digests instead of arch-specific tags #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xeratec merged 3 commits into from
Jul 30, 2025
Merged

Use Docker digests instead of arch-specific tags #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13a0b18
Update action versions and fix missing id
Xeratec Jul 9, 2025
abfa35a
Avoid platform-specific image tags by using digests in Docker manifest
Xeratec Jul 9, 2025
a84f6e5
Update Changelog
Xeratec Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions .github/workflows/BuildDockerDeeploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ jobs:
name: Build Deploy Image
needs: [ prepare ]
runs-on: ${{ matrix.runner }}
outputs:
digest-amd64: ${{ steps.digest.outputs.digest-amd64 }}
digest-arm64: ${{ steps.digest.outputs.digest-arm64 }}
strategy:
fail-fast: false
matrix:
Expand All @@ -57,17 +60,18 @@ jobs:
haskell: true
large-packages: true

- uses: docker/setup-buildx-action@v1
- uses: docker/setup-buildx-action@v3

- name: GHCR Log-in
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build Cache for Docker
uses: actions/cache@v3
id: cache
uses: actions/cache@v4
with:
path: var-ccache
key: ${{ runner.os }}-${{ matrix.platform }}-build-cache-deeploy
Expand All @@ -88,6 +92,7 @@ jobs:
OWNER: '${{ github.repository_owner }}'

- name: Build and push final deploy image
id: build
uses: docker/build-push-action@v6
with:
platforms: linux/${{ matrix.platform }}
Expand All @@ -98,17 +103,19 @@ jobs:
push: true
build-args: |
BASE_IMAGE=${{ github.event.inputs.docker_image_toolchain }}
tags: |
ghcr.io/${{ env.OWNER_LC }}/deeploy:latest-${{ matrix.platform }}
ghcr.io/${{ env.OWNER_LC }}/deeploy:${{ needs.prepare.outputs.docker_tag }}-${{ matrix.platform }}
outputs: type=image,name=ghcr.io/${{ env.OWNER_LC }}/deeploy,annotation-index=true,name-canonical=true,push=true

- name: Extract image digest
id: digest
run: echo "digest-${{ matrix.platform }}=${{ steps.build.outputs.digest }}" >> $GITHUB_OUTPUT

merge-deeploy-images:
name: Merge Deeploy Images
runs-on: ubuntu-latest
needs: [ prepare, build-deeploy ]
steps:
- name: GHCR Log-in
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -120,8 +127,13 @@ jobs:
env:
OWNER: '${{ github.repository_owner }}'

- uses: Noelware/docker-manifest-action@v1
- name: Merge Deeploy Images
uses: Noelware/docker-manifest-action@v1
with:
inputs: ghcr.io/${{ env.OWNER_LC }}/deeploy:latest-amd64,ghcr.io/${{ env.OWNER_LC }}/deeploy:latest-arm64
tags: ghcr.io/${{ env.OWNER_LC }}/deeploy:latest,ghcr.io/${{ env.OWNER_LC }}/deeploy:${{ needs.prepare.outputs.docker_tag }}
inputs: |
ghcr.io/${{ env.OWNER_LC }}/deeploy@${{ needs.build-deeploy.outputs.digest-amd64 }},
ghcr.io/${{ env.OWNER_LC }}/deeploy@${{ needs.build-deeploy.outputs.digest-arm64 }}
tags: |
ghcr.io/${{ env.OWNER_LC }}/deeploy:latest,
ghcr.io/${{ env.OWNER_LC }}/deeploy:${{ needs.prepare.outputs.docker_tag }}
push: true
34 changes: 23 additions & 11 deletions .github/workflows/BuildDockerToolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:
name: Build Deeploy Toolchain Image
needs: [ prepare ]
runs-on: ${{ matrix.runner }}
outputs:
digest-amd64: ${{ steps.digest.outputs.digest-amd64 }}
digest-arm64: ${{ steps.digest.outputs.digest-arm64 }}
strategy:
fail-fast: false
matrix:
Expand All @@ -41,7 +44,7 @@ jobs:
- platform: arm64
runner: ubuntu-22.04-arm
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Free up disk space
uses: jlumbroso/[email protected]
Expand All @@ -51,17 +54,18 @@ jobs:
haskell: true
large-packages: true

- uses: docker/setup-buildx-action@v1
- uses: docker/setup-buildx-action@v3

- name: GHCR Log-in
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build Cache for Docker
uses: actions/cache@v3
id: cache
uses: actions/cache@v4
with:
path: var-ccache
key: ${{ runner.os }}-${{ matrix.platform }}-build-cache-toolchain
Expand All @@ -82,23 +86,26 @@ jobs:
OWNER: '${{ github.repository_owner }}'

- name: Build and push toolchain image
id: build
uses: docker/build-push-action@v6
with:
platforms: linux/${{ matrix.platform }}
context: .
file: Container/Dockerfile.toolchain
push: true
tags: |
ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain:latest-${{ matrix.platform }}
ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain:${{ needs.prepare.outputs.docker_tag }}-${{ matrix.platform }}
outputs: type=image,name=ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain,annotation-index=true,name-canonical=true,push=true

- name: Extract image digest
id: digest
run: echo "digest-${{ matrix.platform }}=${{ steps.build.outputs.digest }}" >> $GITHUB_OUTPUT

merge-toolchain-images:
name: Merge Deeploy Toolchain Images
runs-on: ubuntu-latest
needs: [ prepare, build-toolchain ]
steps:
- name: GHCR Log-in
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -110,8 +117,13 @@ jobs:
env:
OWNER: '${{ github.repository_owner }}'

- uses: Noelware/docker-manifest-action@v1
- name: Merge Toolchain Images
uses: Noelware/docker-manifest-action@v1
with:
inputs: ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain:latest-amd64,ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain:latest-arm64
tags: ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain:latest,ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain:${{ needs.prepare.outputs.docker_tag }}
inputs: |
ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain@${{ needs.build-toolchain.outputs.digest-amd64 }},
ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain@${{ needs.build-toolchain.outputs.digest-arm64 }}
tags: |
ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain:latest,
ghcr.io/${{ env.OWNER_LC }}/deeploy-toolchain:${{ needs.prepare.outputs.docker_tag }}
push: true
7 changes: 4 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ This file contains the changelog for the Deeploy project. The changelog is divid
## Unreleased (Planned Release Target: v0.2.1)
### List of Pull Requests
- Prepare Post v0.2.0 Release [#104](https://github.com/pulp-platform/Deeploy/pull/104)
- Use Docker digests instead of arch-specific tags [#106](https://github.com/pulp-platform/Deeploy/pull/106)

### Added
-
- Output Docker image digests per platform (`amd64`, `arm64`) after build, which is used to construct the multi-arch Docker manifest. This preventes registry clutter caused by unnecessary per-architecture Docker tags.

### Changed
-
- Replaced platform-specific tags (`*-amd64`, `*-arm64`) with direct digest references in `Noelware/docker-manifest-action`.

### Fixed
-
- Resolved issue with missing `id` in the `Build Cache for Docker` step, used in the `Inject build-cache` step.

### Removed
-
Expand Down
Loading