From 92d31908d7e25f221d61794f836b66f67c4b273e1045db5c14b1c203ed3a4661 Mon Sep 17 00:00:00 2001 From: dbw7 Date: Mon, 8 Dec 2025 09:47:39 -0500 Subject: [PATCH 1/4] update to new v1.3.1-rc0 tag --- 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 bac1155..922dcb5 100644 --- a/edge-image-builder-image/Dockerfile +++ b/edge-image-builder-image/Dockerfile @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0.1 -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.0.1-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.1-rc0 +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.1-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="1.3.0.1" +LABEL org.opencontainers.image.version="1.3.1-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.3.0.1-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.1-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 0b243a5..e7c370c 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.3.0 + v1.3.1-rc0 - + 1.3.1~rc0 @PARENT_TAG@ v(\d+).(\d+).(\d+) diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec index 9a4dc7a..f89d5e1 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.3.0 +Version: 1.3.1~rc0 Release: 0 Summary: Edge Image Builder License: Apache-2.0 -- 2.51.1 From ae6ecf7cfce97506bd8e26fa374875b1e2f70911d17f797f078f04ffcecc0a21 Mon Sep 17 00:00:00 2001 From: dbw7 Date: Mon, 8 Dec 2025 11:05:25 -0500 Subject: [PATCH 2/4] remove patch --- .../0001-eib-elemental-reset-fix.patch | 24 ------------------- edge-image-builder/_service | 2 +- edge-image-builder/edge-image-builder.spec | 1 - 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 edge-image-builder/0001-eib-elemental-reset-fix.patch diff --git a/edge-image-builder/0001-eib-elemental-reset-fix.patch b/edge-image-builder/0001-eib-elemental-reset-fix.patch deleted file mode 100644 index 69a5aed..0000000 --- a/edge-image-builder/0001-eib-elemental-reset-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 643bcd634310909d01e1365cf5f3aaac98f25414 Mon Sep 17 00:00:00 2001 -From: Eduardo Minguez -Date: Tue, 11 Nov 2025 17:10:01 +0100 -Subject: [PATCH] Fix #808 - ---- - pkg/combustion/templates/31-elemental-register.sh.tpl | 2 ++ - 1 files changed, 2 insertions(+) - -diff --git a/pkg/combustion/templates/31-elemental-register.sh.tpl b/pkg/combustion/templates/31-elemental-register.sh.tpl -index c1ff4337..91f8b4c2 100644 ---- a/pkg/combustion/templates/31-elemental-register.sh.tpl -+++ b/pkg/combustion/templates/31-elemental-register.sh.tpl -@@ -20,8 +20,10 @@ WantedBy=network-online.target - [Service] - EnvironmentFile=-/etc/sysconfig/proxy - Type=oneshot -+ExecStartPre=/usr/bin/mkdir -p /etc/rancher/elemental/agent - ExecStart=/usr/sbin/elemental-register --debug --config-path /etc/elemental/config.yaml --state-path /etc/elemental/state.yaml --install --no-toolkit - ExecStartPost=/usr/bin/cp /var/lib/elemental/agent/elemental_connection.json /etc/rancher/elemental/agent -+ExecStartPost=/usr/bin/systemctl restart elemental-system-agent.service - Restart=on-failure - RestartSec=10 - EOF diff --git a/edge-image-builder/_service b/edge-image-builder/_service index e7c370c..eeb4a2a 100644 --- a/edge-image-builder/_service +++ b/edge-image-builder/_service @@ -3,7 +3,7 @@ https://github.com/suse-edge/edge-image-builder.git git .git - v1.3.1-rc0 + 1.3.1~rc0 diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec index f89d5e1..c39a8b8 100644 --- a/edge-image-builder/edge-image-builder.spec +++ b/edge-image-builder/edge-image-builder.spec @@ -24,7 +24,6 @@ License: Apache-2.0 URL: https://github.com/suse-edge/edge-image-builder Source: edge-image-builder-%{version}.tar Source1: vendor.tar.gz -Patch: 0001-eib-elemental-reset-fix.patch BuildRequires: golang(API) go1.24 BuildRequires: golang-packaging BuildRequires: gpgme-devel -- 2.51.1 From 7afaa480be3d1fd5aa95c05303cfb0986cc1457d3239baa623788d1a1c863401 Mon Sep 17 00:00:00 2001 From: dbw7 Date: Tue, 9 Dec 2025 10:23:12 -0500 Subject: [PATCH 3/4] feedback updates --- edge-image-builder/_service | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/edge-image-builder/_service b/edge-image-builder/_service index eeb4a2a..34826b8 100644 --- a/edge-image-builder/_service +++ b/edge-image-builder/_service @@ -3,13 +3,13 @@ https://github.com/suse-edge/edge-image-builder.git git .git - + v1.3.1-rc0 1.3.1~rc0 - @PARENT_TAG@ + enable -- 2.51.1 From ce90becac2d3830b37a9b34fc3caddace31df62036ca2f623f21aa694a2b6186 Mon Sep 17 00:00:00 2001 From: dbw7 Date: Wed, 10 Dec 2025 23:45:44 -0500 Subject: [PATCH 4/4] switch to official tag --- edge-image-builder-image/Dockerfile | 8 ++++---- edge-image-builder/_service | 8 ++++---- edge-image-builder/edge-image-builder.spec | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile index 922dcb5..4e6c65f 100644 --- a/edge-image-builder-image/Dockerfile +++ b/edge-image-builder-image/Dockerfile @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.1-rc0 -#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.1-rc0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.1 +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.3.1-%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="1.3.1-rc0" +LABEL org.opencontainers.image.version="1.3.1" 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.3.1-rc0-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.1-%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 34826b8..db1ca2a 100644 --- a/edge-image-builder/_service +++ b/edge-image-builder/_service @@ -3,13 +3,13 @@ https://github.com/suse-edge/edge-image-builder.git git .git - v1.3.1-rc0 + v1.3.1 - 1.3.1~rc0 + - + \1.\2.\3 enable diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec index c39a8b8..4a2184e 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.3.1~rc0 +Version: 1.3.1 Release: 0 Summary: Edge Image Builder License: Apache-2.0 -- 2.51.1