diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile index dc56050..cad327a 100644 --- a/edge-image-builder-image/Dockerfile +++ b/edge-image-builder-image/Dockerfile @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:latest -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:latest-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0-rc0 +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0-rc0-%RELEASE% ARG SLE_VERSION FROM registry.suse.com/bci/bci-base:$SLE_VERSION MAINTAINER SUSE LLC (https://www.suse.com/) @@ -14,11 +14,11 @@ RUN zypper --non-interactive install --no-recommends edge-image-builder qemu-x86 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE edge-image-builder Container Image" LABEL org.opencontainers.image.description="edge-image-builder based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="latest" +LABEL org.opencontainers.image.version="1.3.0-rc0" LABEL org.opencontainers.image.url="https://www.suse.com/products/server/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:latest-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.0-rc0-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" diff --git a/edge-image-builder-image/artifacts.yaml b/edge-image-builder-image/artifacts.yaml index 09cb706..4a62091 100644 --- a/edge-image-builder-image/artifacts.yaml +++ b/edge-image-builder-image/artifacts.yaml @@ -10,8 +10,10 @@ kubernetes: k3s: selinuxPackage: k3s-selinux-1.6-1.slemicro.noarch selinuxRepository: https://rpm.rancher.io/k3s/stable/common/slemicro/noarch + selinuxRepositoryPriority: 1 releaseURL: https://github.com/k3s-io/k3s/releases/download/ rke2: selinuxPackage: rke2-selinux selinuxRepository: https://rpm.rancher.io/rke2/stable/common/slemicro/noarch + selinuxRepositoryPriority: 1 releaseURL: https://github.com/rancher/rke2/releases/download/ diff --git a/edge-image-builder/_service b/edge-image-builder/_service index e6005ed..6fe39df 100644 --- a/edge-image-builder/_service +++ b/edge-image-builder/_service @@ -3,11 +3,11 @@ https://github.com/suse-edge/edge-image-builder.git git .git - 1bfee6bb5bd0dc1ed18e2d09820750f9987c96c9 + v1.3.0-rc0 - + 1.3.0~rc0 - %h + v(\d+).(\d+).(\d+) \1.\2.\3 enable diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec index 728ea83..e457b82 100644 --- a/edge-image-builder/edge-image-builder.spec +++ b/edge-image-builder/edge-image-builder.spec @@ -17,7 +17,7 @@ Name: edge-image-builder -Version: latest +Version: 1.3.0~rc0 Release: 0 Summary: Edge Image Builder License: Apache-2.0