Skip to content

Fix CI image push by resolving env var conflict with Makefile #43

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
alicefr merged 1 commit into from
Jun 3, 2026
Merged

Fix CI image push by resolving env var conflict with Makefile #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 17 additions & 15 deletions .github/workflows/build-node-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ on:
type: boolean

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}/node
PUSH_REGISTRY: ghcr.io/alicefr/bink
PUSH_IMAGE: node

jobs:
build:
Expand All @@ -38,7 +38,7 @@ jobs:

- name: Log in to GHCR
if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.push)
run: podman login -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} ${{ env.REGISTRY }}
run: podman login -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} ghcr.io

- name: Build bootc image
working-directory: node-images/fedora
Expand All @@ -58,19 +58,21 @@ jobs:

- name: Tag and push
if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.push)
working-directory: node-images/fedora
run: |
TAG=${{ steps.meta.outputs.tag }}
BOOTC_SRC=$(make -s print-bootc-image)
DISK_SRC=$(make -s print-node-image)
PUSH_DEST=${{ env.PUSH_REGISTRY }}/${{ env.PUSH_IMAGE }}

# push bootc image under both :latest and versioned tags
podman tag localhost/bink-node:${{ steps.meta.outputs.tag }} \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.tag }}
podman push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.tag }}
podman tag localhost/bink-node:${{ steps.meta.outputs.tag }} \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
podman push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
podman tag ${BOOTC_SRC} ${PUSH_DEST}:${TAG}
podman push ${PUSH_DEST}:${TAG}
podman tag ${BOOTC_SRC} ${PUSH_DEST}:latest
podman push ${PUSH_DEST}:latest

# push disk image under both :latest-disk and versioned tags
podman tag localhost/bink-node:${{ steps.meta.outputs.tag }}-disk \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.tag }}-disk
podman push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.tag }}-disk
podman tag localhost/bink-node:${{ steps.meta.outputs.tag }}-disk \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-disk
podman push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-disk
podman tag ${DISK_SRC} ${PUSH_DEST}:${TAG}-disk
podman push ${PUSH_DEST}:${TAG}-disk
podman tag ${DISK_SRC} ${PUSH_DEST}:latest-disk
podman push ${PUSH_DEST}:latest-disk
10 changes: 8 additions & 2 deletions node-images/fedora/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ BUILD_MEMORY ?= 4G

IMAGE_TAG ?= v$(KUBE_MINOR)-fedora-$(FEDORA_VERSION)
REGISTRY ?= ghcr.io/alicefr/bink
BOOTC_IMAGE ?= $(REGISTRY)/bink-node:$(IMAGE_TAG)
NODE_IMAGE ?= $(REGISTRY)/bink-node:$(IMAGE_TAG)-disk
BOOTC_IMAGE ?= $(REGISTRY)/node:$(IMAGE_TAG)
NODE_IMAGE ?= $(REGISTRY)/node:$(IMAGE_TAG)-disk

# Build the OCI bootc image (k8s + cri-o)
build-bootc-image:
Expand Down Expand Up @@ -50,6 +50,12 @@ build-disk-image: build-bootc-image
print-image-tag:
@echo $(IMAGE_TAG)

print-bootc-image:
@echo $(BOOTC_IMAGE)

print-node-image:
@echo $(NODE_IMAGE)

clean:
@echo "=== Cleaning up ==="
podman rmi -f $(BOOTC_IMAGE) $(NODE_IMAGE) 2>/dev/null || true
Expand Down
Loading