From dfe4892f4c0716c2f825f4b17235a66d2a8736fb9e79c6cedf829c429cc47de0 Mon Sep 17 00:00:00 2001 From: dbw7 Date: Fri, 18 Apr 2025 01:15:50 -0400 Subject: [PATCH 1/5] changes for EIB 1.2.0-rc0 --- edge-image-builder-image/Dockerfile | 8 ++++---- edge-image-builder/_service | 2 +- edge-image-builder/edge-image-builder.spec | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile index 6e9bb60..022279c 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.0 -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0-rc0 +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0-rc0-%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.0" +LABEL org.opencontainers.image.version="1.2.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:1.1.0-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.2.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/_service b/edge-image-builder/_service index 63b3ac7..79b33ec 100644 --- a/edge-image-builder/_service +++ b/edge-image-builder/_service @@ -4,7 +4,7 @@ @PARENT_TAG@ git .git - v1.1.0 + v1.2.0-rc0 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 e1c1f77..205955a 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.0 +Version: 1.2.0-rc0 Release: 0 Summary: Edge Image Builder License: Apache-2.0 -- 2.49.0 From a2c817259fc0765fe0b7acf7f977c09321fc10ad80736b79e8cb4f61e0782216 Mon Sep 17 00:00:00 2001 From: dbw7 Date: Tue, 29 Apr 2025 10:46:01 -0400 Subject: [PATCH 2/5] modify '-' to '~' --- edge-image-builder/_service | 1 + edge-image-builder/edge-image-builder.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/edge-image-builder/_service b/edge-image-builder/_service index 79b33ec..dd6d615 100644 --- a/edge-image-builder/_service +++ b/edge-image-builder/_service @@ -5,6 +5,7 @@ git .git v1.2.0-rc0 + 1.2.0~rc0 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 205955a..79560fa 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.2.0-rc0 +Version: 1.2.0~rc0 Release: 0 Summary: Edge Image Builder License: Apache-2.0 -- 2.49.0 From be29dbba4185c9c29f3105512adbf40a87aef797f7f3ded06ab9a1204a45450a Mon Sep 17 00:00:00 2001 From: Nicolas Belouin Date: Wed, 30 Apr 2025 10:16:16 +0200 Subject: [PATCH 3/5] Fix the _service file to use the defined pre-release version --- edge-image-builder/_service | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/edge-image-builder/_service b/edge-image-builder/_service index dd6d615..f003786 100644 --- a/edge-image-builder/_service +++ b/edge-image-builder/_service @@ -1,11 +1,13 @@ https://github.com/suse-edge/edge-image-builder.git - @PARENT_TAG@ git .git v1.2.0-rc0 + 1.2.0~rc0 + + v(\d+).(\d+).(\d+) \1.\2.\3 enable -- 2.49.0 From 49405f41f9518fed7212f24bd0edd6645ab99b03b42c900a81fdeb4327b14ba6 Mon Sep 17 00:00:00 2001 From: Nicolas Belouin Date: Wed, 30 Apr 2025 10:55:59 +0200 Subject: [PATCH 4/5] EIB v1.2.0-rc0 needs golang 1.124 --- edge-image-builder/edge-image-builder.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec index 79560fa..d8c9e01 100644 --- a/edge-image-builder/edge-image-builder.spec +++ b/edge-image-builder/edge-image-builder.spec @@ -24,7 +24,7 @@ License: Apache-2.0 URL: https://github.com/suse-edge/edge-image-builder Source: edge-image-builder-%{version}.tar Source1: vendor.tar.gz -BuildRequires: golang(API) go1.22 +BuildRequires: golang(API) go1.24 BuildRequires: golang-packaging BuildRequires: gpgme-devel BuildRequires: device-mapper-devel -- 2.49.0 From 4259b167fdad5c8fd110439d4f00775487287fc3716fa86f529128e5bde1eeb8 Mon Sep 17 00:00:00 2001 From: dbw7 Date: Fri, 2 May 2025 11:16:43 -0400 Subject: [PATCH 5/5] update to v1.2.0-rc1 --- edge-image-builder-image/Dockerfile | 8 ++++---- edge-image-builder/_service | 4 ++-- edge-image-builder/edge-image-builder.spec | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile index 022279c..abfe3c9 100644 --- a/edge-image-builder-image/Dockerfile +++ b/edge-image-builder-image/Dockerfile @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0-rc0 -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0-rc0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0-rc1 +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.2.0-rc1-%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.2.0-rc0" +LABEL org.opencontainers.image.version="1.2.0-rc1" 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.2.0-rc0-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.2.0-rc1-%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/_service b/edge-image-builder/_service index f003786..0d61759 100644 --- a/edge-image-builder/_service +++ b/edge-image-builder/_service @@ -3,9 +3,9 @@ https://github.com/suse-edge/edge-image-builder.git git .git - v1.2.0-rc0 + v1.2.0-rc1 - 1.2.0~rc0 + 1.2.0~rc1 v(\d+).(\d+).(\d+) diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec index d8c9e01..21a2ba3 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.2.0~rc0 +Version: 1.2.0~rc1 Release: 0 Summary: Edge Image Builder License: Apache-2.0 -- 2.49.0