Skip to content

Commit

Permalink
Bump framework and osbuilder (#2201)
Browse files Browse the repository at this point in the history
  • Loading branch information
Itxaka committed Feb 2, 2024
1 parent 870f65e commit 3421fc8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reusable-upgrade-latest-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

jobs:
test:
runs-on: ubuntu-latest
runs-on: kvm
env:
MATCHER: ${{ inputs.release_matcher || inputs.flavor_release }}
steps:
Expand Down
28 changes: 14 additions & 14 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG LUET_VERSION=0.35.0
# renovate: datasource=docker depName=aquasec/trivy
ARG TRIVY_VERSION=0.48.3
# renovate: datasource=github-releases depName=kairos-io/kairos-framework
ARG KAIROS_FRAMEWORK_VERSION="v2.6.5"
ARG KAIROS_FRAMEWORK_VERSION="v2.7.1"
ARG COSIGN_SKIP=".*quay.io/kairos/.*"
# TODO: rename ISO_NAME to something like ARTIFACT_NAME because there are place where we use ISO_NAME to refer to the artifact name

Expand All @@ -21,7 +21,7 @@ END
ARG COSIGN_EXPERIMENTAL=0
ARG CGO_ENABLED=0
# renovate: datasource=docker depName=quay.io/kairos/osbuilder-tools versioning=semver-coerced
ARG OSBUILDER_VERSION=v0.11.1
ARG OSBUILDER_VERSION=v0.12.0
ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
ARG GOLINT_VERSION=1.52.2
# renovate: datasource=docker depName=golang
Expand All @@ -33,7 +33,7 @@ ARG RENOVATE_VERSION=37
# renovate: datasource=docker depName=koalaman/shellcheck-alpine versioning=docker
ARG SHELLCHECK_VERSION=v0.9.0
# renovate: datasource=docker depName=quay.io/kairos/enki versioning=docker
ARG ENKI_VERSION=v0.0.12
ARG ENKI_VERSION=v0.0.14

ARG IMAGE_REPOSITORY_ORG=quay.io/kairos

Expand Down Expand Up @@ -324,19 +324,19 @@ enki-image:
SAVE ARTIFACT /enki enki

uki-iso:
ARG --required BASE_IMAGE # BASE_IMAGE is existing kairos image which needs to be converted to uki
FROM $BASE_IMAGE
ARG ISO_NAME=$(cat /etc/os-release | grep 'KAIROS_ARTIFACT' | sed 's/KAIROS_ARTIFACT=\"//' | sed 's/\"//')
ARG ENKI_FLAGS

FROM +uki-dev-tools-image
ARG --required BASE_IMAGE # BASE_IMAGE is existing kairos image which needs to be converted to uki
FROM $BASE_IMAGE
ARG ISO_NAME=$(cat /etc/os-release | grep 'KAIROS_ARTIFACT' | sed 's/KAIROS_ARTIFACT=\"//' | sed 's/\"//')
ARG ENKI_FLAGS

COPY +enki-image/enki /usr/bin/enki
COPY ./tests/keys /keys
RUN echo $BASE_IMAGE > /IMAGE
FROM +uki-dev-tools-image

RUN --no-cache enki build-uki $(cat /IMAGE) -o /tmp/kairos.uki.iso -k /keys ${ENKI_FLAGS}
SAVE ARTIFACT /tmp/kairos.uki.iso kairos.uki.iso AS LOCAL build/$ISO_NAME.uki.iso
COPY +enki-image/enki /usr/bin/enki
COPY ./tests/keys /keys
RUN echo $BASE_IMAGE > /IMAGE
WORKDIR /build
RUN --no-cache enki build-uki $(cat /IMAGE) --output-dir /build/ -k /keys --output-type iso ${ENKI_FLAGS}
SAVE ARTIFACT /build/*.iso AS LOCAL build/

# WARNING the following targets are just for development purposes, use them at your own risk

Expand Down

0 comments on commit 3421fc8

Please sign in to comment.