diff --git a/Earthfile b/Earthfile index 32f4b92..167c8b3 100644 --- a/Earthfile +++ b/Earthfile @@ -9,7 +9,7 @@ ARG IMAGE_REPO=$OS_DISTRIBUTION ARG K8S_DISTRIBUTION ARG CUSTOM_TAG ARG ARCH -ARG PE_VERSION=v4.0.4 +ARG PE_VERSION=v4.0.6 ARG SPECTRO_LUET_VERSION=v1.1.5 ARG KAIROS_VERSION=v2.3.2 ARG K3S_FLAVOR_TAG=k3s1 @@ -38,7 +38,7 @@ ELSE IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ] && [ "$BASE_IMAGE" = "" ] ARG BASE_IMAGE_NAME=core-$OS_DISTRIBUTION ARG BASE_IMAGE_TAG=core-$OS_DISTRIBUTION:$KAIROS_VERSION ARG BASE_IMAGE=$BASE_IMAGE_URL/$BASE_IMAGE_TAG -ELSE IF [ "$OS_DISTRIBUTION" = "rhel" ] +ELSE IF [ "$OS_DISTRIBUTION" = "rhel" ] || [ "$OS_DISTRIBUTION" = "sles" ] # Check for default value for rhel ARG BASE_IMAGE END @@ -270,7 +270,7 @@ base-image: zypper clean END - IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ] + IF [ "$OS_DISTRIBUTION" = "opensuse-leap" ] || [ "$OS_DISTRIBUTION" = "sles" ] RUN zypper install -y apparmor-parser apparmor-profiles RUN zypper cc && \ zypper clean diff --git a/README.md b/README.md index c1e18f0..3d0c36d 100644 --- a/README.md +++ b/README.md @@ -114,9 +114,9 @@ Skip this step if your base image is ubuntu or opensuse-leap. If you are buildin |------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------|-------------------------| | CUSTOM_TAG | Environment name for provider image tagging. The default value is `demo`. | String | `demo` | | IMAGE_REGISTRY | Image registry name that will store the image artifacts. The default value points to the *ttl.sh* image registry, an anonymous and ephemeral Docker image registry where images live for a maximum of 24 hours by default. If you wish to make the images exist longer than 24 hours, you can use any other image registry to suit your needs. | String | `ttl.sh` | -| OS_DISTRIBUTION | OS distribution of your choice. For example, it can be `ubuntu` or `opensuse-leap`. | String | `ubuntu` | +| OS_DISTRIBUTION | OS distribution of your choice. For example, it can be `ubuntu`, `opensuse-leap`, `rhel` or `sles` | String | `ubuntu` | | IMAGE_REPO | Image repository name in your chosen registry. | String | `$OS_DISTRIBUTION` | -| OS_VERSION | OS version. For Ubuntu, the possible values are `20`, and `22`. Whereas for openSUSE Leap, the possible value is `15.4`. This example uses `22` for Ubuntu. | String | `22` | +| OS_VERSION | OS version. For Ubuntu, the possible values are `20`, and `22`. Whereas for openSUSE Leap, the possible value is `15.4`. For sles, possible values are `5.4`. This example uses `22` for Ubuntu. | String | `22` | | K8S_DISTRIBUTION | Kubernetes distribution name. It can be one of these: `k3s`, `rke2`, `kubeadm`, or `kubeadm-fips`. | String | `k3s` | | ISO_NAME | Name of the Edge installer ISO image. In this example, the name is *palette-edge-installer*. | String | `palette-edge-installer`| | ARCH | Type of platform to use for the build. Used for Cross Platform Build (arm64 to amd64 as example). | string | `amd64` |