Skip to content

OCI: fix rockcraft build and multi-arch amd64+arm64 #23

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

OCI: fix rockcraft build and multi-arch amd64+arm64 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
276c9cf
fix: rockcraft build
arelange Aug 2, 2025
939d690
ci: arm64 build and multi-arch container
arelange Jul 29, 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
20 changes: 17 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ on:

jobs:
build-rock:
runs-on: ubuntu-22.04
strategy:
matrix:
include:
- arch: 'amd64'
runner: ubuntu-22.04
- arch: 'arm64'
runner: ubuntu-22.04-arm
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -23,11 +30,18 @@ jobs:
id: rockcraft

build-snap:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- arch: 'amd64'
runner: ubuntu-22.04
- arch: 'arm64'
runner: ubuntu-22.04-arm
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Build Snap Package
uses: snapcore/action-build@v1
id: snapcraft
id: snapcraft
88 changes: 68 additions & 20 deletions .github/workflows/registry-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,26 @@ on:

jobs:
build-rock:
runs-on: ubuntu-22.04
strategy:
matrix:
include:
- arch: 'amd64'
runner: ubuntu-22.04
- arch: 'arm64'
runner: ubuntu-22.04-arm
runs-on: ${{ matrix.runner }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Pack with Rockcraft
uses: canonical/craft-actions/rockcraft-pack@main
id: rockcraft

- name: Upload Rock Artifact
uses: actions/upload-artifact@v4
with:
name: cups-rock
name: cups-rock-${{ matrix.arch }}
path: ${{ steps.rockcraft.outputs.rock }}

publish-rock:
Expand All @@ -49,7 +56,8 @@ jobs:
- name: Download Rock Artifact
uses: actions/download-artifact@v4
with:
name: cups-rock
pattern: cups-rock-*
merge-multiple: true

- name: Install Dependencies
run: |
Expand Down Expand Up @@ -84,20 +92,41 @@ jobs:
run: |
IMAGE="$(yq '.name' rockcraft.yaml)"
VERSION="$(yq '.version' rockcraft.yaml)"
ROCK="$(ls *.rock | tail -n 1)"
ORG_NAME=$(echo "${ORG}" | tr '[:upper:]' '[:lower:]')
sudo rockcraft.skopeo --insecure-policy copy oci-archive:"${ROCK}" docker-daemon:"${ORG_NAME}/${IMAGE}:${VERSION}-edge"
GITHUB_IMAGE="ghcr.io/${ORG_NAME}/${IMAGE}"
#declare -a DOCKER_MANIFESTS=()
declare -a GITHUB_MANIFESTS=()
# Upload each rock to the container registry
for rock in *.rock; do
echo "Create container from ${rock}"
ARCH=$(rockcraft.skopeo --insecure-policy inspect "oci-archive:${rock}" --format "{{ .Architecture }}")
echo "Architecture: ${ARCH}"
rockcraft.skopeo --insecure-policy copy oci-archive:${rock} "docker-daemon:${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-edge"
# Push to Docker Hub
# docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-edge ${USERNAME}:${VERSION}-${ARCH}-edge
# docker push ${USERNAME}/${IMAGE}:${VERSION}-${ARCH}-edge
# DOCKER_MANIFESTS+=("${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-edge")
# Push to GitHub Packages
docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-edge ${GITHUB_IMAGE}:${VERSION}-${ARCH}-edge
docker push ${GITHUB_IMAGE}:${VERSION}-${ARCH}-edge
GITHUB_MANIFESTS+=("${GITHUB_IMAGE}:${VERSION}-${ARCH}-edge")
done

# Create and upload a multi-arch manifest for Docker Hub
# echo "create multi-arch container from: ${DOCKER_MANIFESTS[@]}"
# docker manifest create ${ORG_NAME}/${IMAGE}:${VERSION}-edge ${DOCKER_MANIFESTS[@]}
# Push to Docker Hub
# docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-edge ${USERNAME}:${VERSION}-edge
# docker push ${USERNAME}/${IMAGE}:${VERSION}-edge
# docker tag ${USERNAME}/${IMAGE}:${VERSION}-edge ${USERNAME}/${IMAGE}:latest
# docker push ${USERNAME}/${IMAGE}:latest
# Push to GitHub Packages
GITHUB_IMAGE="ghcr.io/${ORG_NAME}/${IMAGE}"
docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-edge ${GITHUB_IMAGE}:${VERSION}-edge
docker push ${GITHUB_IMAGE}:${VERSION}-edge
docker tag ${GITHUB_IMAGE}:${VERSION}-edge ${GITHUB_IMAGE}:latest
docker push ${GITHUB_IMAGE}:latest

# Create and upload a multi-arch manifest for Github Packages
echo "create multi-arch container from: ${GITHUB_MANIFESTS[@]}"
docker manifest create ${GITHUB_IMAGE}:${VERSION}-edge ${GITHUB_MANIFESTS[@]}
docker manifest push ${GITHUB_IMAGE}:${VERSION}-edge
docker manifest create ${GITHUB_IMAGE}:latest ${GITHUB_MANIFESTS[@]}
docker manifest push ${GITHUB_IMAGE}:latest

- name: Build and Push Docker Image (Stable Channel)
if: github.event.inputs.workflow_choice == 'stable' || github.event.inputs.workflow_choice == 'both'
Expand All @@ -107,13 +136,32 @@ jobs:
run: |
IMAGE="$(yq '.name' rockcraft.yaml)"
VERSION="$(yq '.version' rockcraft.yaml)"
ROCK="$(ls *.rock | tail -n 1)"
ORG_NAME=$(echo "${ORG}" | tr '[:upper:]' '[:lower:]')
sudo rockcraft.skopeo --insecure-policy copy oci-archive:"${ROCK}" docker-daemon:"${ORG_NAME}/${IMAGE}:${VERSION}-stable"
# Push to Docker Hub
# docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-stable ${USERNAME}:${VERSION}-stable
# docker push ${USERNAME}/${IMAGE}:${VERSION}-stable
# Push to GitHub Packages
GITHUB_IMAGE="ghcr.io/${ORG_NAME}/${IMAGE}"
docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-stable ${GITHUB_IMAGE}:${VERSION}-stable
docker push ${GITHUB_IMAGE}:${VERSION}-stable
#declare -a DOCKER_MANIFESTS=()
declare -a GITHUB_MANIFESTS=()
# Upload each rock to the container registry
for rock in *.rock; do
echo "Create container from ${rock}"
ARCH=$(rockcraft.skopeo --insecure-policy inspect "oci-archive:${rock}" --format "{{ .Architecture }}")
echo "Architecture: ${ARCH}"
rockcraft.skopeo --insecure-policy copy oci-archive:${rock} "docker-daemon:${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-stable"
# Push to Docker Hub
# docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-stable ${USERNAME}:${VERSION}-${ARCH}-stable
# docker push ${USERNAME}/${IMAGE}:${VERSION}-${ARCH}-stable
# DOCKER_MANIFESTS+=("${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-stable")
# Push to GitHub Packages
docker tag ${ORG_NAME}/${IMAGE}:${VERSION}-${ARCH}-stable ${GITHUB_IMAGE}:${VERSION}-${ARCH}-stable
docker push ${GITHUB_IMAGE}:${VERSION}-${ARCH}-stable
GITHUB_MANIFESTS+=("${GITHUB_IMAGE}:${VERSION}-${ARCH}-stable")
done

# Create and upload a multi-arch manifest for Docker Hub
# echo "create multi-arch container from: ${DOCKER_MANIFESTS[@]}"
# docker manifest create ${ORG_NAME}/${IMAGE}:${VERSION}-stable ${DOCKER_MANIFESTS[@]}
# docker manifest push ${ORG_NAME}/${IMAGE}:${VERSION}-stable

# Create and upload a multi-arch manifest for Github Packages
echo "create multi-arch container from: ${GITHUB_MANIFESTS[@]}"
docker manifest create ${GITHUB_IMAGE}:${VERSION}-stable ${GITHUB_MANIFESTS[@]}
docker manifest push ${GITHUB_IMAGE}:${VERSION}-stable
2 changes: 1 addition & 1 deletion rockcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,7 @@ parts:

avahi-daemon:
plugin: nil
overlay-packages:
stage-packages:
- avahi-daemon
- avahi-utils
- libnss-mdns
Expand Down