From 13916a02fdb00e664f8552c265039219b49ae682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 15 May 2024 15:49:00 +0000 Subject: [PATCH] Test build for #1050 --- aspnet-runtime-6.0/Dockerfile | 2 +- aspnet-runtime-7.0/Dockerfile | 2 +- aspnet-runtime-8.0/Dockerfile | 2 +- dotnet-6.0/Dockerfile | 2 +- dotnet-7.0/Dockerfile | 2 +- dotnet-8.0/Dockerfile | 2 +- dotnet-runtime-6.0/Dockerfile | 2 +- dotnet-runtime-7.0/Dockerfile | 2 +- dotnet-runtime-8.0/Dockerfile | 2 +- gcc-13-image/Dockerfile | 2 +- gcc-13-image/_constraints | 7 +++++++ gcc-7-image/Dockerfile | 2 +- gcc-7-image/_constraints | 7 +++++++ golang-oldstable-image/Dockerfile | 2 +- golang-oldstable-openssl-image/Dockerfile | 2 +- golang-stable-image/Dockerfile | 2 +- golang-stable-openssl-image/Dockerfile | 2 +- init-image/Dockerfile | 2 +- nodejs-20-image/Dockerfile | 2 +- openjdk-21-image/Dockerfile | 2 +- php-apache8-image/Dockerfile | 2 +- php-fpm8-image/Dockerfile | 2 +- php8-image/Dockerfile | 2 +- python-3.11-image/Dockerfile | 2 +- python-3.12-image/Dockerfile | 2 +- python-3.6-image/Dockerfile | 2 +- rmt-server-image/Dockerfile | 2 +- ruby-2.5-image/Dockerfile | 2 +- rust-oldstable-image/Dockerfile | 2 +- rust-stable-image/Dockerfile | 2 +- sle15-kernel-module-devel-image/Dockerfile | 2 +- spack-image/Dockerfile | 2 +- 32 files changed, 44 insertions(+), 30 deletions(-) create mode 100644 gcc-13-image/_constraints create mode 100644 gcc-7-image/_constraints diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile index efbe27f50..0d7afdade 100644 --- a/aspnet-runtime-6.0/Dockerfile +++ b/aspnet-runtime-6.0/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/dotnet-aspnet:6.0.30-%RELEASE% #!BuildName: bci-dotnet-aspnet-6.0 #!BuildVersion: 15.6.6.0 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/aspnet-runtime-7.0/Dockerfile b/aspnet-runtime-7.0/Dockerfile index 0da9cc24a..4a3f8c557 100644 --- a/aspnet-runtime-7.0/Dockerfile +++ b/aspnet-runtime-7.0/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/dotnet-aspnet:7.0.19-%RELEASE% #!BuildName: bci-dotnet-aspnet-7.0 #!BuildVersion: 15.6.7.0 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile index 9d76c5241..8dfb3f4a2 100644 --- a/aspnet-runtime-8.0/Dockerfile +++ b/aspnet-runtime-8.0/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/dotnet-aspnet:8.0.5-%RELEASE% #!BuildName: bci-dotnet-aspnet-8.0 #!BuildVersion: 15.6.8.0 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile index 19a0bb8fb..e7f5b1af2 100644 --- a/dotnet-6.0/Dockerfile +++ b/dotnet-6.0/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/dotnet-sdk:6.0.30-%RELEASE% #!BuildName: bci-dotnet-sdk-6.0 #!BuildVersion: 15.6.6.0 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/dotnet-7.0/Dockerfile b/dotnet-7.0/Dockerfile index c63956213..3311bc307 100644 --- a/dotnet-7.0/Dockerfile +++ b/dotnet-7.0/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/dotnet-sdk:7.0.19-%RELEASE% #!BuildName: bci-dotnet-sdk-7.0 #!BuildVersion: 15.6.7.0 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile index 544002bec..ef8f94b7b 100644 --- a/dotnet-8.0/Dockerfile +++ b/dotnet-8.0/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/dotnet-sdk:8.0.5-%RELEASE% #!BuildName: bci-dotnet-sdk-8.0 #!BuildVersion: 15.6.8.0 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile index f7c031cab..5bed32622 100644 --- a/dotnet-runtime-6.0/Dockerfile +++ b/dotnet-runtime-6.0/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/dotnet-runtime:6.0.30-%RELEASE% #!BuildName: bci-dotnet-runtime-6.0 #!BuildVersion: 15.6.6.0 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/dotnet-runtime-7.0/Dockerfile b/dotnet-runtime-7.0/Dockerfile index afaee1628..a9e4a375c 100644 --- a/dotnet-runtime-7.0/Dockerfile +++ b/dotnet-runtime-7.0/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/dotnet-runtime:7.0.19-%RELEASE% #!BuildName: bci-dotnet-runtime-7.0 #!BuildVersion: 15.6.7.0 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile index 80d6c53d4..cb913a432 100644 --- a/dotnet-runtime-8.0/Dockerfile +++ b/dotnet-runtime-8.0/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/dotnet-runtime:8.0.5-%RELEASE% #!BuildName: bci-dotnet-runtime-8.0 #!BuildVersion: 15.6.8.0 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile index 3ab1b1b95..496067489 100644 --- a/gcc-13-image/Dockerfile +++ b/gcc-13-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/gcc:%%gcc_version%%-%RELEASE% #!BuildName: bci-gcc-13 #!BuildVersion: 15.6.13 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/gcc-13-image/_constraints b/gcc-13-image/_constraints new file mode 100644 index 000000000..df1320bf4 --- /dev/null +++ b/gcc-13-image/_constraints @@ -0,0 +1,7 @@ + + + + 6 + + + diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile index 02051c145..e14807e1c 100644 --- a/gcc-7-image/Dockerfile +++ b/gcc-7-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/gcc:%%gcc_version%%-%RELEASE% #!BuildName: bci-gcc-7 #!BuildVersion: 15.6.7 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/gcc-7-image/_constraints b/gcc-7-image/_constraints new file mode 100644 index 000000000..df1320bf4 --- /dev/null +++ b/gcc-7-image/_constraints @@ -0,0 +1,7 @@ + + + + 6 + + + diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile index 86c20b1f8..0d8ae2b16 100644 --- a/golang-oldstable-image/Dockerfile +++ b/golang-oldstable-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/golang:1.21-2.%RELEASE% #!BuildName: bci-golang-oldstable #!BuildVersion: 15.6.1.21.2 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile index 947583703..f3d764f41 100644 --- a/golang-oldstable-openssl-image/Dockerfile +++ b/golang-oldstable-openssl-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/golang:1.20-openssl-%RELEASE% #!BuildName: bci-golang-oldstable-openssl #!BuildVersion: 15.6 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile index e93c2f567..9e92e9ab8 100644 --- a/golang-stable-image/Dockerfile +++ b/golang-stable-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/golang:1.22-1.%RELEASE% #!BuildName: bci-golang-stable #!BuildVersion: 15.6.1.22.1 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile index a9c499cd5..d4b3675d6 100644 --- a/golang-stable-openssl-image/Dockerfile +++ b/golang-stable-openssl-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/golang:1.21-openssl-%RELEASE% #!BuildName: bci-golang-stable-openssl #!BuildVersion: 15.6 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/init-image/Dockerfile b/init-image/Dockerfile index f274d3097..6922e008a 100644 --- a/init-image/Dockerfile +++ b/init-image/Dockerfile @@ -18,7 +18,7 @@ #!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE% #!BuildName: bci-bci-init-%OS_VERSION_ID_SP% #!BuildVersion: 15.6 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile index a4b22995b..c850068ec 100644 --- a/nodejs-20-image/Dockerfile +++ b/nodejs-20-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/node:20-%RELEASE% #!BuildName: bci-nodejs-20 #!BuildVersion: 15.6.20 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/openjdk-21-image/Dockerfile b/openjdk-21-image/Dockerfile index 772c95ec3..b50defbd4 100644 --- a/openjdk-21-image/Dockerfile +++ b/openjdk-21-image/Dockerfile @@ -18,7 +18,7 @@ #!BuildTag: bci/openjdk:21-%RELEASE% #!BuildName: bci-openjdk-21 #!BuildVersion: 15.6.21 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/php-apache8-image/Dockerfile b/php-apache8-image/Dockerfile index 44f19df81..01b0de825 100644 --- a/php-apache8-image/Dockerfile +++ b/php-apache8-image/Dockerfile @@ -18,7 +18,7 @@ #!BuildTag: bci/php-apache:8-%RELEASE% #!BuildName: bci-php-apache-8 #!BuildVersion: 15.6.8 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/php-fpm8-image/Dockerfile b/php-fpm8-image/Dockerfile index 77f74aff6..9d9fc9fa9 100644 --- a/php-fpm8-image/Dockerfile +++ b/php-fpm8-image/Dockerfile @@ -18,7 +18,7 @@ #!BuildTag: bci/php-fpm:8-%RELEASE% #!BuildName: bci-php-fpm-8 #!BuildVersion: 15.6.8 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/php8-image/Dockerfile b/php8-image/Dockerfile index aaed49022..6e924763a 100644 --- a/php8-image/Dockerfile +++ b/php8-image/Dockerfile @@ -18,7 +18,7 @@ #!BuildTag: bci/php:8-%RELEASE% #!BuildName: bci-php-8 #!BuildVersion: 15.6.8 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/python-3.11-image/Dockerfile b/python-3.11-image/Dockerfile index 81506bf76..b43905971 100644 --- a/python-3.11-image/Dockerfile +++ b/python-3.11-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/python:3-%RELEASE% #!BuildName: bci-python-3.11 #!BuildVersion: 15.6.3.11 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/python-3.12-image/Dockerfile b/python-3.12-image/Dockerfile index 14956c909..c1ab17729 100644 --- a/python-3.12-image/Dockerfile +++ b/python-3.12-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/python:3-%RELEASE% #!BuildName: bci-python-3.12 #!BuildVersion: 15.6.3.12 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/python-3.6-image/Dockerfile b/python-3.6-image/Dockerfile index 8cae1fdad..1f2e184a7 100644 --- a/python-3.6-image/Dockerfile +++ b/python-3.6-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/python:3-%RELEASE% #!BuildName: bci-python-3.6 #!BuildVersion: 15.6.3.6 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/rmt-server-image/Dockerfile b/rmt-server-image/Dockerfile index 0b465af91..648421af2 100644 --- a/rmt-server-image/Dockerfile +++ b/rmt-server-image/Dockerfile @@ -16,7 +16,7 @@ #!BuildTag: suse/rmt-server:%%rmt_version%% #!BuildTag: suse/rmt-server:%%rmt_version%%-%RELEASE% -#!BuildName: suse-rmt-server-%%rmt_version%% +#!BuildName: suse-rmt-server #!BuildVersion: 15.6 FROM suse/sle15:15.6 diff --git a/ruby-2.5-image/Dockerfile b/ruby-2.5-image/Dockerfile index 524eb1c51..8cdccf81f 100644 --- a/ruby-2.5-image/Dockerfile +++ b/ruby-2.5-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/ruby:2-%RELEASE% #!BuildName: bci-ruby-2.5 #!BuildVersion: 15.6.2.5 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/rust-oldstable-image/Dockerfile b/rust-oldstable-image/Dockerfile index d44c8ffd1..199db1f1c 100644 --- a/rust-oldstable-image/Dockerfile +++ b/rust-oldstable-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/rust:1.76-2.%RELEASE% #!BuildName: bci-rust-oldstable #!BuildVersion: 15.6.1.76.2 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/rust-stable-image/Dockerfile b/rust-stable-image/Dockerfile index e96a03e92..d47b7af25 100644 --- a/rust-stable-image/Dockerfile +++ b/rust-stable-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/rust:1.77-1.%RELEASE% #!BuildName: bci-rust-stable #!BuildVersion: 15.6.1.77.1 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/sle15-kernel-module-devel-image/Dockerfile b/sle15-kernel-module-devel-image/Dockerfile index 6b37309b6..148a8b858 100644 --- a/sle15-kernel-module-devel-image/Dockerfile +++ b/sle15-kernel-module-devel-image/Dockerfile @@ -18,7 +18,7 @@ #!BuildTag: bci/bci-sle15-kernel-module-devel:%OS_VERSION_ID_SP%.%RELEASE% #!BuildName: bci-bci-sle15-kernel-module-devel-%OS_VERSION_ID_SP% #!BuildVersion: 15.6 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/) diff --git a/spack-image/Dockerfile b/spack-image/Dockerfile index 0ecf6b368..02e48f59a 100644 --- a/spack-image/Dockerfile +++ b/spack-image/Dockerfile @@ -20,7 +20,7 @@ #!BuildTag: bci/spack:%%spack_minor%%-%RELEASE% #!BuildName: bci-spack-%%spack_version%% #!BuildVersion: 15.6 -FROM suse/sle15:15.6 +FROM bci/bci-base:15.6 MAINTAINER SUSE LLC (https://www.suse.com/)