From 75c61c7fed2b2052469c56aab6ab30d6df158e50 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Tue, 24 Sep 2024 19:51:10 +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 --- alertmanager-image/Dockerfile | 1 - aspnet-runtime-6.0/Dockerfile | 1 - aspnet-runtime-8.0/Dockerfile | 1 - blackbox_exporter-image/Dockerfile | 1 - dotnet-6.0/Dockerfile | 1 - dotnet-8.0/Dockerfile | 1 - dotnet-runtime-6.0/Dockerfile | 1 - dotnet-runtime-8.0/Dockerfile | 1 - gcc-13-image/Dockerfile | 1 - gcc-7-image/Dockerfile | 1 - git-image/git-image.kiwi | 4 ++-- golang-oldstable-image/Dockerfile | 1 - golang-oldstable-openssl-image/Dockerfile | 1 - golang-stable-image/Dockerfile | 1 - golang-stable-openssl-image/Dockerfile | 1 - grafana-image/Dockerfile | 2 -- kiwi-image/Dockerfile | 2 -- nodejs-20-image/Dockerfile | 2 -- pcp-image/Dockerfile | 2 -- php-apache8-image/Dockerfile | 1 - php-fpm8-image/Dockerfile | 1 - php8-image/Dockerfile | 1 - 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 -- ruby-2.5-image/Dockerfile | 1 - rust-oldstable-image/Dockerfile | 1 - rust-stable-image/Dockerfile | 1 - sac-apache-tomcat-10-java21-image/Dockerfile | 1 - spack-image/Dockerfile | 1 - 32 files changed, 2 insertions(+), 42 deletions(-) diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile index d0ecaf03f..d654d5199 100644 --- a/alertmanager-image/Dockerfile +++ b/alertmanager-image/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: suse/alertmanager:%%alertmanager_patch_version%% #!BuildTag: suse/alertmanager:%%alertmanager_patch_version%%-%RELEASE% #!BuildTag: suse/alertmanager:%%alertmanager_minor_version%% -#!BuildTag: suse/alertmanager:%%alertmanager_minor_version%%-%RELEASE% #!BuildTag: suse/alertmanager:latest #!BuildName: suse-alertmanager-%%alertmanager_patch_version%% #!BuildVersion: 15.6 diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile index d474cdddf..cac860581 100644 --- a/aspnet-runtime-6.0/Dockerfile +++ b/aspnet-runtime-6.0/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: bci/dotnet-aspnet:6.0 #!BuildTag: bci/dotnet-aspnet:6.0-%RELEASE% #!BuildTag: bci/dotnet-aspnet:6.0.33 -#!BuildTag: bci/dotnet-aspnet:6.0.33-%RELEASE% #!BuildName: bci-dotnet-aspnet-6.0 #!BuildVersion: 15.6.6.0 #!BuildRelease: 32 diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile index 7418e07ef..b7379e967 100644 --- a/aspnet-runtime-8.0/Dockerfile +++ b/aspnet-runtime-8.0/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: bci/dotnet-aspnet:8.0 #!BuildTag: bci/dotnet-aspnet:8.0-%RELEASE% #!BuildTag: bci/dotnet-aspnet:8.0.8 -#!BuildTag: bci/dotnet-aspnet:8.0.8-%RELEASE% #!BuildTag: bci/dotnet-aspnet:latest #!BuildName: bci-dotnet-aspnet-8.0 #!BuildVersion: 15.6.8.0 diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile index 80870a4e8..5ee5469d8 100644 --- a/blackbox_exporter-image/Dockerfile +++ b/blackbox_exporter-image/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%% #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_patch_version%%-%RELEASE% #!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_minor_version%% -#!BuildTag: suse/blackbox_exporter:%%blackbox_exporter_minor_version%%-%RELEASE% #!BuildTag: suse/blackbox_exporter:latest #!BuildName: suse-blackbox_exporter-%%blackbox_exporter_patch_version%% #!BuildVersion: 15.6 diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile index b3de08e51..d859a18ed 100644 --- a/dotnet-6.0/Dockerfile +++ b/dotnet-6.0/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: bci/dotnet-sdk:6.0 #!BuildTag: bci/dotnet-sdk:6.0-%RELEASE% #!BuildTag: bci/dotnet-sdk:6.0.33 -#!BuildTag: bci/dotnet-sdk:6.0.33-%RELEASE% #!BuildName: bci-dotnet-sdk-6.0 #!BuildVersion: 15.6.6.0 #!BuildRelease: 32 diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile index 5103d90df..9c73ab79c 100644 --- a/dotnet-8.0/Dockerfile +++ b/dotnet-8.0/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: bci/dotnet-sdk:8.0 #!BuildTag: bci/dotnet-sdk:8.0-%RELEASE% #!BuildTag: bci/dotnet-sdk:8.0.8 -#!BuildTag: bci/dotnet-sdk:8.0.8-%RELEASE% #!BuildTag: bci/dotnet-sdk:latest #!BuildName: bci-dotnet-sdk-8.0 #!BuildVersion: 15.6.8.0 diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile index 59c48093b..5c122a4f6 100644 --- a/dotnet-runtime-6.0/Dockerfile +++ b/dotnet-runtime-6.0/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: bci/dotnet-runtime:6.0 #!BuildTag: bci/dotnet-runtime:6.0-%RELEASE% #!BuildTag: bci/dotnet-runtime:6.0.33 -#!BuildTag: bci/dotnet-runtime:6.0.33-%RELEASE% #!BuildName: bci-dotnet-runtime-6.0 #!BuildVersion: 15.6.6.0 #!BuildRelease: 32 diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile index d36cb0014..76d5fadda 100644 --- a/dotnet-runtime-8.0/Dockerfile +++ b/dotnet-runtime-8.0/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: bci/dotnet-runtime:8.0 #!BuildTag: bci/dotnet-runtime:8.0-%RELEASE% #!BuildTag: bci/dotnet-runtime:8.0.8 -#!BuildTag: bci/dotnet-runtime:8.0.8-%RELEASE% #!BuildTag: bci/dotnet-runtime:latest #!BuildName: bci-dotnet-runtime-8.0 #!BuildVersion: 15.6.8.0 diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile index ec0c985ff..192700644 100644 --- a/gcc-13-image/Dockerfile +++ b/gcc-13-image/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: bci/gcc:13 #!BuildTag: bci/gcc:13-%RELEASE% #!BuildTag: bci/gcc:%%gcc_minor_version%% -#!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE% #!BuildTag: bci/gcc:latest #!BuildName: bci-gcc-13 #!BuildVersion: 15.6.13 diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile index 6618309c6..8f76df42f 100644 --- a/gcc-7-image/Dockerfile +++ b/gcc-7-image/Dockerfile @@ -18,7 +18,6 @@ #!BuildTag: bci/gcc:7 #!BuildTag: bci/gcc:7-%RELEASE% #!BuildTag: bci/gcc:%%gcc_minor_version%% -#!BuildTag: bci/gcc:%%gcc_minor_version%%-%RELEASE% #!BuildName: bci-gcc-7 #!BuildVersion: 15.6.7 FROM bci/bci-base:15.6 diff --git a/git-image/git-image.kiwi b/git-image/git-image.kiwi index 2a3c1c398..fb7465e69 100644 --- a/git-image/git-image.kiwi +++ b/git-image/git-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 --> - + @@ -28,7 +28,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions + additionaltags="%%git_minor_version%%-%RELEASE%,%%git_major_version%%,%%git_version%%,latest">