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

PEM-5782 use ubuntu image instead of ubuntu-systemd #272

Merged
merged 1 commit into from
Sep 6, 2024
Merged

PEM-5782 use ubuntu image instead of ubuntu-systemd #272

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
14 changes: 7 additions & 7 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ uki-iso:
SAVE ARTIFACT /build/* AS LOCAL ./build/

uki-provider-image:
FROM --platform=linux/${ARCH} +ubuntu-systemd
FROM --platform=linux/${ARCH} +ubuntu
RUN apt-get update && apt-get install -y rsync

WORKDIR /
Expand Down Expand Up @@ -414,7 +414,7 @@ download-sbctl:
SAVE ARTIFACT /usr/bin/sbctl

uki-byok:
FROM +ubuntu-systemd
FROM +ubuntu

RUN apt-get update && apt-get install -y efitools curl
COPY +download-sbctl/sbctl /usr/bin/sbctl
Expand Down Expand Up @@ -826,7 +826,7 @@ build-efi-size-check:
SAVE ARTIFACT target/x86_64-unknown-uefi/debug/efi-size-check.efi

iso-efi-size-check:
FROM +ubuntu-systemd
FROM +ubuntu

RUN apt-get update
RUN apt-get install -y mtools xorriso
Expand All @@ -848,13 +848,13 @@ iso-efi-size-check:

SAVE ARTIFACT efi-size-check.iso AS LOCAL ./build/

ubuntu-systemd:
ubuntu:
IF [ "$FIPS_ENABLED" = "true" ]
ARG SYSTEMD_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu-systemd-fips:20.04
ARG UBUNTU_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu-fips:22.04
ELSE
ARG SYSTEMD_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu-systemd:22.04
ARG UBUNTU_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu:22.04
END
FROM $SYSTEMD_IMAGE
FROM $UBUNTU_IMAGE

OS_RELEASE:
COMMAND
Expand Down
2 changes: 1 addition & 1 deletion earthly.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ PE_VERSION=$(git describe --abbrev=0 --tags)
SPECTRO_PUB_REPO=gcr.io/spectro-images-public
EARTHLY_VERSION=v0.8.5
source .arg
ALPINE_IMG=$SPECTRO_PUB_REPO/alpine:3.20.2
ALPINE_IMG=$SPECTRO_PUB_REPO/canvos/alpine:3.20
### Verify Depencies
# Check if Docker is installed
if command -v docker >/dev/null 2>&1; then
Expand Down