Skip to content

Commit

Permalink
Use Kairos Factory for Ubuntu 24.04 (#198)
Browse files Browse the repository at this point in the history
  • Loading branch information
sdwilsh committed Aug 17, 2024
1 parent 5d212aa commit c190ed0
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/kairos-ubuntu-24-lts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,15 @@ jobs:
env:
BRANCH: ${{ github.ref_type == 'tag' && github.ref_name || github.event_name != 'pull_request' && 'latest' || format('pr-{0}', github.head_ref) }}

- name: Build & Push Image
- name: Build & Push Base Image
env:
EARTHLY_CI: true
EARTHLY_PUSH: ${{ github.event_name != 'pull_request' }}
run: earthly ./images/kairos-ubuntu-24-lts/+base-image --TAG=$TAG

- name: Build & Push Kairos Image
env:
EARTHLY_CI: true
EARTHLY_PUSH: ${{ github.event_name != 'pull_request' }}
# In the short-term, we need to use the sdwilsh fork until that fix is released upstream.
run: earthly ./images/kairos-ubuntu-24-lts/+base-image --KAIROS_ORG=sdwilsh --KAIROS_VERSION=fix-earthly-remote-invocation --TAG=$TAG
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
!.yarn/versions

# Kairos Factory dumps stuff under /build locally
/build
15 changes: 15 additions & 0 deletions images/kairos-ubuntu-24-lts/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,18 @@ base-image:
.
SAVE IMAGE --push ghcr.io/marinatedconcrete/ubuntu-24-lts:$TAG

kairos-image:
ARG --required TAG

ARG KAIROS_ORG=kairos-io
# renovate: datasource=github-releases depName=kairos-io/kairos
ARG KAIROS_VERSION=v3.1.1

BUILD github.com/$KAIROS_ORG/kairos:$KAIROS_VERSION+base-image \
--BASE_IMAGE=ghcr.io/marinatedconcrete/ubuntu-24-lts:$TAG \
--BOOTLOADER=grub \
--FAMILY=ubuntu \
--FLAVOR=ubuntu \
--FLAVOR_RELEASE=24.04 \
--MODEL=generic \
--VARIANT=standard

0 comments on commit c190ed0

Please sign in to comment.