From c74dc444468b71b5c99916a5c2ee8df7efaa649a Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Wed, 21 Jan 2026 09:22:51 -0700 Subject: [PATCH 1/3] Publish Docker images to Docker Hub and GHCR Signed-off-by: Andy Bavier --- .github/workflows/push.yml | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 0000000..1f2ac4d --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2024 Intel Corporation +# Copyright 2025 Canonical Ltd. +name: Release Pipeline + +on: + push: + branches: + - main + - docker-publish-oci + paths: + - "VERSION" + +permissions: + contents: read + +jobs: + # CAUTION: Other actions depend on this name "tag-github" + tag-github: + uses: onosproject/.github/.github/workflows/tag-github.yml@main + secrets: inherit + + release-image: + needs: tag-github + if: needs.tag-github.outputs.changed == 'true' + permissions: + contents: read + packages: write + actions: read + id-token: write + attestations: write + uses: onosproject/.github/.github/workflows/release-image.yml@main + with: + docker_tag: ${{ needs.tag-github.outputs.version }} + secrets: inherit + + update-version: + needs: tag-github + if: needs.tag-github.outputs.changed == 'true' + uses: onosproject/.github/.github/workflows/bump-version.yml@main + secrets: inherit + with: + version: ${{ needs.tag-github.outputs.version }} From 66488b1b29e35fd86bee3133b3d91489d8be9472 Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Wed, 21 Jan 2026 09:25:07 -0700 Subject: [PATCH 2/3] Update Makefile Signed-off-by: Andy Bavier --- .github/workflows/push.yml | 1 - Makefile | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 1f2ac4d..c5dbaad 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,7 +7,6 @@ on: push: branches: - main - - docker-publish-oci paths: - "VERSION" diff --git a/Makefile b/Makefile index 7536c74..c3c665f 100644 --- a/Makefile +++ b/Makefile @@ -179,6 +179,14 @@ aether-roc-api-docker: # @HELP build aether-roc-api Docker image -t ${DOCKER_IMAGENAME_API} @rm -rf vendor +# Docker targets for compatibility with GitHub workflow +docker-build: # @HELP build Docker image +docker-build: images + +docker-push: # @HELP push Docker image +docker-push: + docker push ${DOCKER_IMAGENAME_API} + images: # @HELP build all Docker images images: build aether-roc-api-docker From fe8b58f4d936d76775114a547f73a29ab4364229 Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Wed, 21 Jan 2026 15:22:28 -0700 Subject: [PATCH 3/3] Prefix 'v' to tags Signed-off-by: Andy Bavier --- .github/workflows/push.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c5dbaad..e813851 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -30,7 +30,8 @@ jobs: attestations: write uses: onosproject/.github/.github/workflows/release-image.yml@main with: - docker_tag: ${{ needs.tag-github.outputs.version }} + # Prefix the version with 'v' to follow tagging conventions + docker_tag: v${{ needs.tag-github.outputs.version }} secrets: inherit update-version: @@ -39,4 +40,5 @@ jobs: uses: onosproject/.github/.github/workflows/bump-version.yml@main secrets: inherit with: - version: ${{ needs.tag-github.outputs.version }} + # Prefix the version with 'v' to follow tagging conventions + version: v${{ needs.tag-github.outputs.version }}