update to new v1.3.1 tag #325

Merged
dprodanov merged 4 commits from :main into main 2025-12-11 12:04:59 +01:00
4 changed files with 7 additions and 32 deletions

View File

@@ -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
#!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.0.1"
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.0.1-%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"

View File

@@ -1,24 +0,0 @@
From 643bcd634310909d01e1365cf5f3aaac98f25414 Mon Sep 17 00:00:00 2001
From: Eduardo Minguez <eduardo.minguez@suse.com>
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

View File

@@ -3,9 +3,9 @@
<param name="url">https://github.com/suse-edge/edge-image-builder.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="revision">v1.3.0</param>
<param name="revision">v1.3.1</param>
dprodanov marked this conversation as resolved Outdated

This line should stay uncommented, line 10 to 12 should be commented however

This line should stay uncommented, line 10 to 12 should be commented however
<!-- Uncomment and set this For Pre-Release Version -->
<!-- <param name="version">1.3.0</param> -->
<!-- <param name="version">1.3.1</param> -->
<!-- Uncomment and this for regular version -->
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>

View File

@@ -17,14 +17,13 @@
Name: edge-image-builder
Version: 1.3.0
Version: 1.3.1
Release: 0
Summary: Edge Image Builder
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