From 8fc790693a57624af80a39b3242c17d39aea5282cc191d9fd7eeb57eafb68738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 14 Oct 2024 11:29:59 +0000 Subject: [PATCH] [info=3b54d2916204758fbf74f02f55bcfc1c] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/apache-tomcat-9-image?expand=0&rev=9 --- Dockerfile.openjdk17 | 7 ++++--- apache-tomcat-9-image.changes | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile.openjdk17 b/Dockerfile.openjdk17 index a745ad7..8d41ed5 100644 --- a/Dockerfile.openjdk17 +++ b/Dockerfile.openjdk17 @@ -15,9 +15,10 @@ #!UseOBSRepositories +#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE% +#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17 #!BuildTag: opensuse/apache-tomcat:9-openjdk17-%RELEASE% #!BuildTag: opensuse/apache-tomcat:9-openjdk17 -#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17 FROM opensuse/bci/bci-micro:latest AS target FROM opensuse/tumbleweed:latest AS builder @@ -40,8 +41,8 @@ LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL org.opencontainers.image.ref.name="9-openjdk17-%RELEASE%" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:9-openjdk17-%RELEASE%" +LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk17-%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk17-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI" LABEL org.opensuse.release-stage="released" diff --git a/apache-tomcat-9-image.changes b/apache-tomcat-9-image.changes index b742747..442f9f7 100644 --- a/apache-tomcat-9-image.changes +++ b/apache-tomcat-9-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot + +- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag + ------------------------------------------------------------------- Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot