From 51e6605efa2fbd30ea9f0f6b68b4ef933be8fc4c Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Fri, 11 Oct 2024 15:08:26 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 389-ds-container/Dockerfile | 2 +- alertmanager-image/Dockerfile | 2 +- aspnet-runtime-6.0/Dockerfile | 2 +- aspnet-runtime-8.0/Dockerfile | 2 +- base-fips-image/Dockerfile | 2 +- blackbox_exporter-image/Dockerfile | 2 +- busybox-image/busybox-image.kiwi | 6 +++--- distribution-image/distribution-image.kiwi | 6 +++--- dotnet-6.0/Dockerfile | 2 +- dotnet-8.0/Dockerfile | 2 +- dotnet-runtime-6.0/Dockerfile | 2 +- dotnet-runtime-8.0/Dockerfile | 2 +- gcc-13-image/Dockerfile | 2 +- gcc-7-image/Dockerfile | 2 +- git-image/git-image.kiwi | 6 +++--- golang-oldstable-image/Dockerfile | 4 ++-- golang-oldstable-openssl-image/Dockerfile | 4 ++-- golang-stable-image/Dockerfile | 4 ++-- golang-stable-openssl-image/Dockerfile | 4 ++-- grafana-image/Dockerfile | 2 +- helm-image/helm-image.kiwi | 6 +++--- init-image/Dockerfile | 2 +- kiwi-image/Dockerfile | 2 +- micro-image/micro-image.kiwi | 6 +++--- minimal-image/minimal-image.kiwi | 6 +++--- nginx-image/Dockerfile | 2 +- nodejs-20-image/Dockerfile | 4 ++-- openjdk-21-devel-image/Dockerfile | 2 +- openjdk-21-image/Dockerfile | 2 +- pcp-image/Dockerfile | 2 +- php-apache8-image/Dockerfile | 2 +- php-fpm8-image/Dockerfile | 2 +- php8-image/Dockerfile | 2 +- postgres-16-image/Dockerfile | 2 +- prometheus-image/Dockerfile | 2 +- python-3.11-image/Dockerfile | 2 +- python-3.12-image/Dockerfile | 2 +- python-3.6-image/Dockerfile | 2 +- rmt-mariadb-client-image/Dockerfile | 4 ++-- rmt-mariadb-image/Dockerfile | 4 ++-- rmt-nginx-image/Dockerfile | 2 +- rmt-server-image/Dockerfile | 2 +- ruby-2.5-image/Dockerfile | 2 +- rust-oldstable-image/Dockerfile | 4 ++-- rust-stable-image/Dockerfile | 4 ++-- sac-apache-tomcat-10-image/Dockerfile.openjdk17 | 2 +- sac-apache-tomcat-10-image/Dockerfile.openjdk21 | 2 +- sac-postfix-image/Dockerfile | 2 +- sac-python-3.9-image/Dockerfile | 2 +- sle15-kernel-module-devel-image/Dockerfile | 2 +- sles15-image/sles15-image.kiwi | 2 +- spack-image/Dockerfile | 2 +- 52 files changed, 73 insertions(+), 73 deletions(-) diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile index fcf920c8c..f96ed7b9c 100644 --- a/389-ds-container/Dockerfile +++ b/389-ds-container/Dockerfile @@ -15,8 +15,8 @@ #!UseOBSRepositories -#!BuildTag: suse/389-ds:%%389ds_version%% #!BuildTag: suse/389-ds:%%389ds_version%%-%RELEASE% +#!BuildTag: suse/389-ds:%%389ds_version%% #!BuildTag: suse/389-ds:latest #!BuildName: suse-389-ds-%%389ds_version%% #!BuildVersion: 15.6 diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile index cf86dd746..826c4acf3 100644 --- a/alertmanager-image/Dockerfile +++ b/alertmanager-image/Dockerfile @@ -15,8 +15,8 @@ #!UseOBSRepositories -#!BuildTag: suse/alertmanager:%%alertmanager_patch_version%% #!BuildTag: suse/alertmanager:%%alertmanager_patch_version%%-%RELEASE% +#!BuildTag: suse/alertmanager:%%alertmanager_patch_version%% #!BuildTag: suse/alertmanager:%%alertmanager_minor_version%% #!BuildTag: suse/alertmanager:latest #!BuildName: suse-alertmanager-%%alertmanager_patch_version%% diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile index 9888be981..1425aab33 100644 --- a/aspnet-runtime-6.0/Dockerfile +++ b/aspnet-runtime-6.0/Dockerfile @@ -15,8 +15,8 @@ #!UseOBSRepositories #!ExclusiveArch: x86_64 -#!BuildTag: bci/dotnet-aspnet:6.0 #!BuildTag: bci/dotnet-aspnet:6.0-%RELEASE% +#!BuildTag: bci/dotnet-aspnet:6.0 #!BuildTag: bci/dotnet-aspnet:6.0.35 #!BuildName: bci-dotnet-aspnet-6.0 #!BuildVersion: 15.6.6.0 diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile index 770eab65a..b88d5c71a 100644 --- a/aspnet-runtime-8.0/Dockerfile +++ b/aspnet-runtime-8.0/Dockerfile @@ -15,8 +15,8 @@ #!UseOBSRepositories #!ExclusiveArch: x86_64 -#!BuildTag: bci/dotnet-aspnet:8.0 #!BuildTag: bci/dotnet-aspnet:8.0-%RELEASE% +#!BuildTag: bci/dotnet-aspnet:8.0 #!BuildTag: bci/dotnet-aspnet:8.0.10 #!BuildTag: bci/dotnet-aspnet:latest #!BuildName: bci-dotnet-aspnet-8.0 diff --git a/base-fips-image/Dockerfile b/base-fips-image/Dockerfile index f59082ed3..d8cbe2c4d 100644 --- a/base-fips-image/Dockerfile +++ b/base-fips-image/Dockerfile @@ -15,8 +15,8 @@ #!UseOBSRepositories -#!BuildTag: bci/bci-base-fips:%OS_VERSION_ID_SP% #!BuildTag: bci/bci-base-fips:%OS_VERSION_ID_SP%.%RELEASE% +#!BuildTag: bci/bci-base-fips:%OS_VERSION_ID_SP% #!BuildTag: bci/bci-base-fips:latest #!BuildName: bci-bci-base-fips-%OS_VERSION_ID_SP% #!BuildVersion: 15.6 diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile index d90733499..483765630 100644 --- a/blackbox_exporter-image/Dockerfile +++ b/blackbox_exporter-image/Dockerfile @@ -15,8 +15,8 @@ #!UseOBSRepositories -#!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%% #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%%-%RELEASE% +#!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%% #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_minor_version%% #!BuildTag: suse/blackbox_exporter:latest #!BuildName: suse-blackbox_exporter-%%blackbox_exporter_patch_version%% diff --git a/busybox-image/busybox-image.kiwi b/busybox-image/busybox-image.kiwi index 3b33ca35a..d16f27ffb 100644 --- a/busybox-image/busybox-image.kiwi +++ b/busybox-image/busybox-image.kiwi @@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator Please submit bugfixes or comments via https://bugs.opensuse.org/ You can contact the BCI team via https://github.com/SUSE/bci/discussions --> - + @@ -27,8 +27,8 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions + tag="%OS_VERSION_ID_SP%.%RELEASE%" + additionaltags="%OS_VERSION_ID_SP%,latest">