rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-08-04 09:29:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #165 from kairos-io/bump_enki_ukify

Browse Source
This commit is contained in:
Itxaka 2024-06-24 16:10:51 +02:00 committed by GitHub
commit b6aafd6e23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/tool-image.yml vendored
View File

@ -2,6 +2,7 @@
name: 'build tools container images' name: 'build tools container images'
on: on:
pull_request:
push: push:
branches: branches:
- master - master
@ -54,8 +55,18 @@ jobs:
registry: quay.io registry: quay.io
username: ${{ secrets.QUAY_USERNAME }} username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }} password: ${{ secrets.QUAY_PASSWORD }}
- name: Build - name: Build
if: github.event_name == 'pull_request'
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
context: ./tools-image
file: ./tools-image/Dockerfile
platforms: linux/amd64,linux/arm64
push: false
tags: ${{ steps.prep.outputs.tags }}
- name: Build and push
if: github.event_name != 'pull_request'
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: ${{ steps.buildx.outputs.name }} builder: ${{ steps.buildx.outputs.name }}

11
tools-image/Dockerfile
View File

@ -1,18 +1,16 @@
# https://quay.io/repository/kairos/packages?tab=tags&tag=latest # https://quay.io/repository/kairos/packages?tab=tags&tag=latest
ARG LEAP_VERSION=15.5 ARG LEAP_VERSION=15.5
ARG LUET_VERSION=0.35.2 ARG LUET_VERSION=0.35.2
ARG ENKI_VERSION=v0.0.32 ARG ENKI_VERSION=0.1.0
FROM quay.io/luet/base:$LUET_VERSION AS luet FROM quay.io/luet/base:$LUET_VERSION AS luet
FROM quay.io/kairos/enki:${ENKI_VERSION} as enki FROM quay.io/kairos/enki:v${ENKI_VERSION} as enki
FROM opensuse/leap:$LEAP_VERSION as default FROM opensuse/leap:$LEAP_VERSION as default
RUN zypper ref && zypper dup -y RUN zypper ref && zypper dup -y
## ISO+ Arm image + Netboot + cloud images Build depedencies ## ISO+ Arm image + Netboot + cloud images Build depedencies
RUN zypper ref && zypper in -y bc qemu-tools jq cdrtools docker git curl gptfdisk kpartx sudo xfsprogs parted \ RUN zypper ref && zypper in -y bc qemu-tools jq cdrtools docker git curl gptfdisk kpartx sudo xfsprogs parted \
util-linux-systemd e2fsprogs curl util-linux udev rsync grub2 dosfstools grub2-x86_64-efi squashfs mtools xorriso lvm2 zstd util-linux-systemd e2fsprogs curl util-linux udev rsync grub2 dosfstools grub2-x86_64-efi squashfs mtools xorriso lvm2 zstd
RUN zypper in -y python311-pip python311-cryptography sbsigntools tpm2-* # ukify deps
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1 # make python3.11 the default python3 for ukify
COPY --from=luet /usr/bin/luet /usr/bin/luet COPY --from=luet /usr/bin/luet /usr/bin/luet
ENV LUET_NOLOCK=true ENV LUET_NOLOCK=true
ENV TMPDIR=/tmp ENV TMPDIR=/tmp
@ -27,11 +25,6 @@ RUN cp /tmp/luet-${TARGETARCH}.yaml /etc/luet/luet.yaml
## Uki artifacts, will be set under the /usr/kairos directory ## Uki artifacts, will be set under the /usr/kairos directory
RUN luet install -y system/systemd-boot RUN luet install -y system/systemd-boot
# ukify + measure
RUN luet install -y system/systemd-ukify
# ukify deps that are not in the suse repos as packages. ukify package provides this so we have the exact versions needed
RUN pip3 install -r /usr/kairos/ukify-requirements.txt
## Live CD artifacts ## Live CD artifacts
RUN luet install -y livecd/grub2 --system-target /grub2 RUN luet install -y livecd/grub2 --system-target /grub2
RUN luet install -y livecd/grub2-efi-image --system-target /efi RUN luet install -y livecd/grub2-efi-image --system-target /efi