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

sync release-4.0 to main #58

Merged
merged 4 commits into from
Sep 21, 2023
Merged

sync release-4.0 to main #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73fb980
PE-2605 Adding apparmor-parser as se_linux is disabled (#57)
rishi-anand Sep 14, 2023
80eaa2d
Updating Earthfile with Luet version v1.1.4 (#55)
rishi-anand Sep 14, 2023
58ab429
Update PE_VERSION
santhoshdaivajna Sep 15, 2023
f67db2a
Update ubuntu-fips kernel for fips
santhoshdaivajna Sep 21, 2023
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
11 changes: 9 additions & 2 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ ARG IMAGE_REPO=$OS_DISTRIBUTION
ARG K8S_DISTRIBUTION
ARG CUSTOM_TAG
ARG ARCH
ARG PE_VERSION=v4.0.3
ARG SPECTRO_LUET_VERSION=v1.1.2
ARG PE_VERSION=v4.0.4
ARG SPECTRO_LUET_VERSION=v1.1.4
ARG KAIROS_VERSION=v2.3.2
ARG K3S_FLAVOR_TAG=k3s1
ARG RKE2_FLAVOR_TAG=rke2r1
Expand Down Expand Up @@ -266,6 +266,13 @@ base-image:
RUN zypper cc && \
zypper clean
END

IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ]
RUN zypper install -y apparmor-parser apparmor-profiles
RUN zypper cc && \
zypper clean
END

IF [ "$ARCH" = "arm64" ]
RUN mkdir -p /etc/luet/repos.conf.d && luet repo add spectro --type docker --url gcr.io/spectro-dev-public/luet-repo-arm --priority 1 -y && luet repo update
ELSE IF [ "$ARCH" = "amd64" ]
Expand Down
3 changes: 3 additions & 0 deletions ubuntu-fips/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ RUN rm -rf /boot/initramfs-*
# Fixup sudo perms
RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo

# Symlink kernel HMAC
RUN kernel=$(ls /boot/vmlinuz-* | head -n1) && ln -sf ."${kernel#/boot/}".hmac /boot/.vmlinuz.hmac

RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv

Expand Down