Merge branch 'main' into pxke-1289

spectrocloud · May 21, 2024 · 15e688e · 15e688e
2 parents 777a04d + 6f963fc
commit 15e688e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/Earthfile b/Earthfile
@@ -90,11 +90,11 @@ IF [[ "$BASE_IMAGE" =~ "nvidia-jetson-agx-orin" ]]
 END
 
 IF [ "$FIPS_ENABLED" = "true" ]
-    ARG STYLUS_BASE=gcr.io/spectro-images-public/stylus-framework-fips-linux-$ARCH:$PE_VERSION
-    ARG STYLUS_PACKAGE_BASE=gcr.io/spectro-images-public/stylus-fips-linux-$ARCH:$PE_VERSION
+    ARG STYLUS_BASE=$SPECTRO_PUB_REPO/stylus-framework-fips-linux-$ARCH:$PE_VERSION
+    ARG STYLUS_PACKAGE_BASE=$SPECTRO_PUB_REPO/stylus-fips-linux-$ARCH:$PE_VERSION
 ELSE
-    ARG STYLUS_BASE=gcr.io/spectro-images-public/stylus-framework-linux-$ARCH:$PE_VERSION
-    ARG STYLUS_PACKAGE_BASE=gcr.io/spectro-images-public/stylus-linux-$ARCH:$PE_VERSION
+    ARG STYLUS_BASE=$SPECTRO_PUB_REPO/stylus-framework-linux-$ARCH:$PE_VERSION
+    ARG STYLUS_PACKAGE_BASE=$SPECTRO_PUB_REPO/stylus-linux-$ARCH:$PE_VERSION
 END
 
 IF [ "$CUSTOM_TAG" != "" ]

diff --git a/README.md b/README.md
@@ -110,7 +110,7 @@ cp .arg.template .arg
 6. To build RHEL core, RHEL FIPS or Ubuntu fips, sles base images switch to respective directories and build the base image.
    The base image built can be passed as argument to build the installer and provider images.
    Follow the instructions in the respective sub-folders (rhel-fips, ubuntu-fips) to create base images.
-   For ubuntu-fips, this image can be used as base image - `gcr.io/spectro-images-public/ubuntu-fips:v3.0.10`
+   For ubuntu-fips, this image can be used as base image - `gcr.io/spectro-images-public/ubuntu-fips:v3.0.11`
    Skip this step if your base image is ubuntu or opensuse-leap. If you are building ubuntu or opensuse-leap installer images, do not pass the BASE_IMAGE attribute as an arg to build command.
 
 7. Modify the `.arg` file as needed. Primarily, you must define the tag you want to use for your images. For example, if the operating system is `ubuntu` and the tag is `demo`, the image artefact will name as `ttl.sh/ubuntu:k3s-1.25.2-v3.4.3-demo`. The **.arg** file defines the following variables:
@@ -165,7 +165,7 @@ To build the provider images
 To build the fips enabled ubuntu installer image
 
 ```shell
-./earthly.sh +iso --BASE_IMAGE=gcr.io/spectro-images-public/ubuntu-fips:v3.0.10 --FIPS_ENABLED=true --ARCH=amd64 --PE_VERSION=v4.3.2
+./earthly.sh +iso --BASE_IMAGE=gcr.io/spectro-images-public/ubuntu-fips:v3.0.11 --FIPS_ENABLED=true --ARCH=amd64 --PE_VERSION=v4.4.0
 ```
 
 Output

diff --git a/earthly.sh b/earthly.sh
@@ -63,7 +63,9 @@ docker rmi alpine:latest
 
 if [[ "$1" == "+uki-genkey" ]]; then
     ./keys.sh secure-boot/
-else
+fi
+
+if [[ "$1" == "+build-provider-images" ]] || [[ "$1" == "+build-provider-images-fips" ]] ; then
     # Print the output for use in Palette Profile.
     echo -e '##########################################################################################################'
     echo -e '\nPASTE THE CONTENT BELOW INTO YOUR CLUSTER PROFILE IN PALETTE REPLACING ALL THE CONTENTS IN THE PROFILE\n'

diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8
@@ -57,7 +57,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \
     rsync jq && dnf clean all
 
 
-COPY --from=quay.io/kairos/framework:v2.7.32 / /
+COPY --from=quay.io/kairos/framework:v2.7.33 / /
 
 RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
 RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml

diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile
@@ -84,7 +84,7 @@ RUN mkdir -p /run/lock && \
 # Copy the os-release file to identify the OS
 COPY --from=osbuilder /workspace/os-release /etc/os-release
 
-COPY --from=quay.io/kairos/framework:v2.7.32-fips / /
+COPY --from=quay.io/kairos/framework:v2.7.33-fips / /
 
 RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
 RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml

diff --git a/slem/Dockerfile b/slem/Dockerfile
@@ -28,7 +28,7 @@ RUN mkdir -p /run/lock
 RUN mkdir -p /usr/libexec
 RUN touch /usr/libexec/.keep
 
-COPY --from=quay.io/kairos/framework:v2.7.32 / /
+COPY --from=quay.io/kairos/framework:v2.7.33 / /
 
 RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
 RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml

diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile
@@ -1,6 +1,6 @@
 
 # Kairos framework packages for ubuntu fips
-FROM quay.io/kairos/framework:v2.7.32-fips as kairos-fips
+FROM quay.io/kairos/framework:v2.7.33-fips as kairos-fips
 
 # Base ubuntu image (focal)
 FROM ubuntu:focal as base