Skip to content

Commit

Permalink
feat(ci): honor env.IMAGE_REGISTRY in Containerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
m0gg committed Jul 31, 2024
1 parent 932f2ef commit 293f84d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ jobs:
FEDORA_MAJOR_VERSION=${{ matrix.fedora_version }}
RPMFUSION_MIRROR=${{ vars.RPMFUSION_MIRROR }}
KERNEL_VERSION=${{ env.KERNEL_VERSION }}
IMAGE_REGISTRY=${{ env.IMAGE_REGISTRY }}
labels: ${{ steps.meta.outputs.labels }}
oci: false

Expand Down
7 changes: 4 additions & 3 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ ARG SOURCE_ORG="${SOURCE_ORG:-fedora-ostree-desktops}"
ARG BASE_IMAGE="quay.io/${SOURCE_ORG}/${SOURCE_IMAGE}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.7-200.fc40.x86_64}"
ARG IMAGE_REGISTRY=ghcr.io/ublue-os

FROM ghcr.io/ublue-os/config:latest AS config
FROM ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} AS akmods
FROM ghcr.io/ublue-os/main-kernel:${KERNEL_VERSION} AS kernel
FROM ${IMAGE_REGISTRY}/config:latest AS config
FROM ${IMAGE_REGISTRY}/akmods:main-${FEDORA_MAJOR_VERSION} AS akmods
FROM ${IMAGE_REGISTRY}/main-kernel:${KERNEL_VERSION} AS kernel

FROM scratch AS ctx
COPY / /
Expand Down

0 comments on commit 293f84d

Please sign in to comment.