From 89f78c74b8b99b0ce2594334f142f9089358f42849a6e259eb90fb2f3a5aea41 Mon Sep 17 00:00:00 2001 From: dbw7 Date: Tue, 5 Aug 2025 03:11:39 -0400 Subject: [PATCH] Revert "Merge pull request 'Changes for EIB v1.1.2' (#224) from dbekhit/Factory:3.2 into 3.2" This reverts commit 873b7ca8d6fc080e76eab6dd1b9f1b54f800aedaea9d20ca6b99f01fe8a3575a, reversing changes made to 9549266bdc8420ba77e90cc1095d8a233422fdddaa7c8d9f4fa3880c1cba9027. --- edge-image-builder-image/Dockerfile | 8 ++++---- edge-image-builder/_service | 6 +++--- edge-image-builder/edge-image-builder.spec | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/edge-image-builder-image/Dockerfile b/edge-image-builder-image/Dockerfile index e282c16..d7234a0 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.1 +#!BuildTag: %%IMG_PREFIX%%edge-image-builder:1.1.1-%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.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.1.2-rc1-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.1.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 f42a8a5..4951b00 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.1 - 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..16faa40 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.1 Release: 0 Summary: Edge Image Builder License: Apache-2.0 -- 2.49.0