Skip to content
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

chore: switch to official upstream images #687

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

chore: switch to official upstream images #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7620bb9
chore: switch to official upstream images
p5 Dec 2, 2024
0a5e79e
fix: base image matrix build arg
p5 Dec 2, 2024
258f9eb
fix: update base_image matrix variable casing
p5 Dec 2, 2024
51d2ad9
fix: pull the correct base image
p5 Dec 2, 2024
6978934
chore: reverse
p5 Dec 2, 2024
05addf3
fix: prefix source image names with "fedora-"
p5 Dec 2, 2024
a43dbe7
fix: some hacks to work around different naming conventions
p5 Dec 2, 2024
07920b0
fix: check source_image for fedora- prefix
p5 Dec 2, 2024
1ec625e
fix: this should be it - use source_image if prefixed with fedora-
p5 Dec 2, 2024
453c4c5
Merge branch 'main' into switch-to-official-images
p5 Dec 2, 2024
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
24 changes: 20 additions & 4 deletions .github/workflows/reusable-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
type: string
env:
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
SOURCE_ORG: fedora

concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}-${{ inputs.fedora_version }}
Expand All @@ -34,6 +35,17 @@ jobs:
- base
- lazurite
- vauxite
include:
- image_name: base
source_org: fedora-ostree-desktops
- image_name: lazurite
source_org: fedora-ostree-desktops
- image_name: vauxite
source_org: fedora-ostree-desktops
- image_name: sericea
source_image: fedora-sway-atomic
- image_name: onyx
source_image: fedora-budgie-atomic

steps:
# Checkout push-to-registry action GitHub repository
Expand All @@ -43,12 +55,16 @@ jobs:
- name: Matrix Variables
shell: bash
run: |
if [[ "${{ matrix.image_name }}" == "mate" ]]; then
echo "SOURCE_IMAGE=base" >> $GITHUB_ENV
if [[ "${{ matrix.source_org }}" == "fedora-ostree-desktops" ]]; then
echo "SOURCE_IMAGE=${{ matrix.image_name }}" >> $GITHUB_ENV
echo "SOURCE_ORG=${{ matrix.source_org }}" >> $GITHUB_ENV
else
echo "SOURCE_IMAGE=${{ matrix.image_name }}" >> $GITHUB_ENV
if [[ "${{ matrix.source_image }}" == fedora-* ]]; then
echo "SOURCE_IMAGE=${{ matrix.source_image }}" >> $GITHUB_ENV
else
echo "SOURCE_IMAGE=fedora-${{ matrix.image_name }}" >> $GITHUB_ENV
fi
fi
echo "SOURCE_ORG=fedora-ostree-desktops" >> $GITHUB_ENV
echo "IMAGE_NAME=${{ matrix.image_name }}-main" >> $GITHUB_ENV

- name: Generate tags
Expand Down
2 changes: 1 addition & 1 deletion Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
ARG SOURCE_IMAGE="${SOURCE_IMAGE:-silverblue}"
ARG SOURCE_ORG="${SOURCE_ORG:-fedora-ostree-desktops}"
ARG SOURCE_ORG="${SOURCE_ORG:-fedora}"
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}"
Expand Down
Loading