From 6a36a5a78a3390d764d954b363b626f75f87f84612d2ad38488d81a7e9538c75 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=7f0eda7bcb8fdacfb42fcccc8bf99014] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/apache-tomcat-10-image?expand=0&rev=9 --- Dockerfile.openjdk17 | 7 ++++--- Dockerfile.openjdk21 | 7 ++++--- Dockerfile.openjdk22 | 7 ++++--- apache-tomcat-10-image.changes | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Dockerfile.openjdk17 b/Dockerfile.openjdk17 index 95a4d90..bd08fc3 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:10.1-openjdk17-%RELEASE% #!BuildTag: opensuse/apache-tomcat:10.1-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="10.1-openjdk17-%RELEASE%" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10.1-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/Dockerfile.openjdk21 b/Dockerfile.openjdk21 index ce58c98..e8f77b3 100644 --- a/Dockerfile.openjdk21 +++ b/Dockerfile.openjdk21 @@ -15,9 +15,10 @@ #!UseOBSRepositories +#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21-%RELEASE% +#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21 #!BuildTag: opensuse/apache-tomcat:10.1-openjdk21-%RELEASE% #!BuildTag: opensuse/apache-tomcat:10.1-openjdk21 -#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21 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="10.1-openjdk21-%RELEASE%" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk21-%RELEASE%" +LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk21-%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk21-%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/Dockerfile.openjdk22 b/Dockerfile.openjdk22 index d44bfc3..d8d1088 100644 --- a/Dockerfile.openjdk22 +++ b/Dockerfile.openjdk22 @@ -15,9 +15,10 @@ #!UseOBSRepositories +#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22-%RELEASE% +#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22 #!BuildTag: opensuse/apache-tomcat:10.1-openjdk22-%RELEASE% #!BuildTag: opensuse/apache-tomcat:10.1-openjdk22 -#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22 #!BuildTag: opensuse/apache-tomcat:latest FROM opensuse/bci/bci-micro:latest AS target @@ -41,8 +42,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="10.1-openjdk22-%RELEASE%" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22-%RELEASE%" +LABEL org.opencontainers.image.ref.name="%%tomcat_version%%-openjdk22-%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:%%tomcat_version%%-openjdk22-%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-10-image.changes b/apache-tomcat-10-image.changes index dc49734..e824c45 100644 --- a/apache-tomcat-10-image.changes +++ b/apache-tomcat-10-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