diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile index e282c16..b6ea4cc 100644 --- a/edge-image-builder-image/Dockerfile +++ b/edge-image-builder-image/Dockerfile @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.2-rc1 -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.2-rc1-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.2 +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.2-%RELEASE% #!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-base:$SLE_VERSION @@ -15,11 +15,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="1.1.2-rc1" +LABEL org.opencontainers.image.version="1.1.2" 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:1.1.2-rc1-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.1.2-%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 5ae44bb..e59946c 100644 --- a/edge-image-builder-image/artifacts.yaml +++ b/edge-image-builder-image/artifacts.yaml @@ -10,6 +10,8 @@ kubernetes: k3s: selinuxPackage: k3s-selinux-1.6-1.slemicro.noarch selinuxRepository: https://rpm.rancher.io/k3s/stable/common/slemicro/noarch + releaseURL: https://github.com/k3s-io/k3s/releases/download/ rke2: selinuxPackage: rke2-selinux selinuxRepository: https://rpm.rancher.io/rke2/stable/common/slemicro/noarch + releaseURL: https://github.com/rancher/rke2/releases/download/ diff --git a/edge-image-builder/_service b/edge-image-builder/_service index f42a8a5..0432629 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 - v1.1.2-rc1 + v1.1.2 - 1.1.2~rc0 + - + @PARENT_TAG@ 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 2935aae..05c2540 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: 1.1.2~rc1 +Version: 1.1.2 Release: 0 Summary: Edge Image Builder License: Apache-2.0