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

🐧 Bring back ubuntu 24.10 uki #2939

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🐧 Bring back ubuntu 24.10 uki #2939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .github/workflows/uki.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ jobs:
flavor_release: 24.04
family: ubuntu
base_image: ubuntu:24.04
- flavor: ubuntu
flavor_release: "24.10"
family: ubuntu
base_image: "ubuntu:24.10"
- flavor: fedora
family: rhel
flavor_release: 40
Expand Down
21 changes: 10 additions & 11 deletions images/Dockerfile.kairos-ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# for UKI, install the linux-modules pkg if no modules are found
RUN [ -z "$(ls -A /lib/modules/)" ] && apt-get update && apt-get install -y --no-install-recommends \
"$(apt-cache search linux-modules | grep -oP 'linux-modules-\d+.\d+.\d+-\d+-generic' | sort -V | tail -1)" \
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* || true
# for UKI, install the linux-image pkg if no kernel is found
RUN [ -z "$(ls -A /boot/vmlinuz*)" ] && apt-get update && apt-get install -y --no-install-recommends \
"$(apt-cache search linux-image | grep -oP 'linux-image-\d+.\d+.\d+-\d+-generic' | sort -V | tail -1)" \
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* || true

# This target is aimed at non-UKI images where size is not a concern
FROM common AS grub
Expand All @@ -141,23 +141,22 @@ RUN apt-get update \

FROM systemd-boot AS systemd-boot-amd64
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
shared-mime-info \
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
&& apt-get install -y --no-install-recommends shared-mime-info \
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
RUN [ -z "$(ls -A /lib/firmware/amd/)" ] && apt-get update && apt-get install -y --no-install-recommends \
&& apt-get install -y --no-install-recommends \
amd64-microcode \
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
&& apt-get install -y --no-install-recommends amd64-microcode \
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* || true
RUN [ -z "$(ls -A /lib/firmware/intel-ucode/)" ] && apt-get update && apt-get install -y --no-install-recommends \
&& apt-get install -y --no-install-recommends \
intel-microcode \
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
&& apt-get install -y --no-install-recommends intel-microcode \
&& apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/* || true

FROM systemd-boot AS systemd-boot-arm64

FROM systemd-boot-amd64 AS systemd-boot-amd64-24.10
RUN apt-get update && apt-get install -y systemd-cryptsetup && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
FROM systemd-boot-amd64 AS systemd-boot-amd64-24.04
FROM systemd-boot-arm64 AS systemd-boot-arm64-24.10
RUN apt-get update && apt-get install -y systemd-cryptsetup && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
FROM systemd-boot-arm64 AS systemd-boot-arm64-24.04

FROM grub AS grub-amd64
Expand Down
2 changes: 2 additions & 0 deletions images/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ RUN [ -z "$(ls -A /lib/firmware/intel-ucode/)" ] && apt-get update && apt-get in
FROM systemd-boot AS systemd-boot-arm64

FROM systemd-boot-amd64 AS systemd-boot-amd64-24.10
RUN apt-get update && apt-get install -y systemd-cryptsetup && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we always have to remove unattended-upgrades after anything we install? Is it a dependency all all packages somehow?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea. Monkey see, monkey do. :D

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hehe good question, maybe it can be run just once, I didn't really dig deep enough into it

FROM systemd-boot-amd64 AS systemd-boot-amd64-24.04
FROM systemd-boot-arm64 AS systemd-boot-arm64-24.10
RUN apt-get update && apt-get install -y systemd-cryptsetup && apt-get remove -y unattended-upgrades && apt-get clean && rm -rf /var/lib/apt/lists/*
FROM systemd-boot-arm64 AS systemd-boot-arm64-24.04

FROM grub AS grub-amd64
Expand Down
Loading