Test build for #1050

SUSE · May 15, 2024 · db393aa · db393aa
1 parent 15484b1
commit db393aa
Show file tree

Hide file tree

Showing 35 changed files with 53 additions and 39 deletions.
diff --git 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.5.6.0
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git 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.5.7.0
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile
@@ -21,7 +21,7 @@
 #!BuildTag: bci/dotnet-aspnet:latest
 #!BuildName: bci-dotnet-aspnet-8.0
 #!BuildVersion: 15.5.8.0
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git 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.5.6.0
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git 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.5.7.0
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile
@@ -21,7 +21,7 @@
 #!BuildTag: bci/dotnet-sdk:latest
 #!BuildName: bci-dotnet-sdk-8.0
 #!BuildVersion: 15.5.8.0
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git 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.5.6.0
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git 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.5.7.0
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile
@@ -21,7 +21,7 @@
 #!BuildTag: bci/dotnet-runtime:latest
 #!BuildName: bci-dotnet-runtime-8.0
 #!BuildVersion: 15.5.8.0
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -21,7 +21,7 @@
 #!BuildTag: bci/gcc:latest
 #!BuildName: bci-gcc-13
 #!BuildVersion: 15.5.13
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/gcc-13-image/_constraints b/gcc-13-image/_constraints
@@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <disk>
+      <size unit="G">6</size>
+    </disk>
+  </hardware>
+</constraints>
diff --git 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.5.7
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/gcc-7-image/_constraints b/gcc-7-image/_constraints
@@ -0,0 +1,7 @@
+<constraints>
+  <hardware>
+    <disk>
+      <size unit="G">6</size>
+    </disk>
+  </hardware>
+</constraints>
diff --git 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.5.1.21.2
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git 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.5
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -21,7 +21,7 @@
 #!BuildTag: bci/golang:latest
 #!BuildName: bci-golang-stable
 #!BuildVersion: 15.5.1.22.1
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -21,7 +21,7 @@
 #!BuildTag: bci/golang:latest
 #!BuildName: bci-golang-stable-openssl
 #!BuildVersion: 15.5
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -19,7 +19,7 @@
 #!BuildTag: bci/bci-init:latest
 #!BuildName: bci-bci-init-%OS_VERSION_ID_SP%
 #!BuildVersion: 15.5
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/nodejs-18-image/Dockerfile b/nodejs-18-image/Dockerfile
@@ -20,7 +20,7 @@
 #!BuildTag: bci/node:18-%RELEASE%
 #!BuildName: bci-nodejs-18
 #!BuildVersion: 15.5.18
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
@@ -22,7 +22,7 @@
 #!BuildTag: bci/node:latest
 #!BuildName: bci-nodejs-20
 #!BuildVersion: 15.5.20
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/openjdk-11-image/Dockerfile b/openjdk-11-image/Dockerfile
@@ -18,7 +18,7 @@
 #!BuildTag: bci/openjdk:11-%RELEASE%
 #!BuildName: bci-openjdk-11
 #!BuildVersion: 15.5.11
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/openjdk-17-image/Dockerfile b/openjdk-17-image/Dockerfile
@@ -19,7 +19,7 @@
 #!BuildTag: bci/openjdk:latest
 #!BuildName: bci-openjdk-17
 #!BuildVersion: 15.5.17
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/pcp-image/README.md b/pcp-image/README.md
@@ -14,7 +14,7 @@ $ podman run -d \
     -p 44321:44321 \
     -p 44322:44322 \
     -v pcp-archives:/var/log/pcp/pmlogger \
-    registry.suse.com/suse/pcp:%%pcp_patch%%
+    registry.suse.com/suse/pcp:latest
 ```
 
 **Note:** On SELinux enabled systems, the following boolean needs to be set: `sudo setsebool -P container_manage_cgroup true`
@@ -30,7 +30,7 @@ $ sudo podman run -d \
     -e HOST_MOUNT=/host \
     -v pcp-archives:/var/log/pcp/pmlogger \
     -v /:/host:ro,rslave \
-    registry.suse.com/suse/pcp:%%pcp_patch%%
+    registry.suse.com/suse/pcp:latest
 ```
 
 ## Configuration
@@ -65,7 +65,7 @@ $ podman run -d \
     -e PCP_SERVICES=pmlogger \
     -v $(pwd)/pmlogger.control:/etc/pcp/pmlogger/control.d/local:z \
     -v pcp-archives:/var/log/pcp/pmlogger \
-    registry.suse.com/suse/pcp:%%pcp_patch%%
+    registry.suse.com/suse/pcp:latest
 ```
 
 pmlogger.control:

diff --git a/php-apache8-image/Dockerfile b/php-apache8-image/Dockerfile
@@ -19,7 +19,7 @@
 #!BuildTag: bci/php-apache:latest
 #!BuildName: bci-php-apache-8
 #!BuildVersion: 15.5.8
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/php-fpm8-image/Dockerfile b/php-fpm8-image/Dockerfile
@@ -19,7 +19,7 @@
 #!BuildTag: bci/php-fpm:latest
 #!BuildName: bci-php-fpm-8
 #!BuildVersion: 15.5.8
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/php8-image/Dockerfile b/php8-image/Dockerfile
@@ -19,7 +19,7 @@
 #!BuildTag: bci/php:latest
 #!BuildName: bci-php-8
 #!BuildVersion: 15.5.8
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/python-3.11-image/Dockerfile b/python-3.11-image/Dockerfile
@@ -21,7 +21,7 @@
 #!BuildTag: bci/python:latest
 #!BuildName: bci-python-3.11
 #!BuildVersion: 15.5.3.11
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git 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.5.3.6
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/rmt-mariadb-image/README.md b/rmt-mariadb-image/README.md
@@ -10,13 +10,13 @@ By default, the image launches MariaDB with the same configuration that comes wi
 The only environment variable required to start the container is the MariaDB root password.
 
 ```ShellSession
-$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.suse.com/suse/rmt-mariadb:%%mariadb_version%%
+$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.suse.com/suse/rmt-mariadb:latest
 ```
 
 or:
 
 ```ShellSession
-$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.suse.com/suse/rmt-mariadb:%%mariadb_version%%
+$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.suse.com/suse/rmt-mariadb:latest
 ```
 
 ### Volumes
@@ -31,7 +31,7 @@ When using the MariaDB image, we recommend one of the following options:
 To mount a host directory as a volume for your data run the following command:
 
 ```ShellSession
-$ podman run -it --rm -v /my/own/datadir:/var/lib/mysql:Z -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.suse.com/suse/rmt-mariadb:%%mariadb_version%%
+$ podman run -it --rm -v /my/own/datadir:/var/lib/mysql:Z -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.suse.com/suse/rmt-mariadb:latest
 ```
 
 The `-v /my/own/datadir:/var/lib/mysql:Z` part of the command mounts the `/my/own/datadir` directory from the underlying host system as `/var/lib/mysql` inside the container, where MariaDB will by default write its data files.

diff --git a/rmt-server-image/Dockerfile b/rmt-server-image/Dockerfile
@@ -17,7 +17,7 @@
 #!BuildTag: suse/rmt-server:%%rmt_version%%
 #!BuildTag: suse/rmt-server:%%rmt_version%%-%RELEASE%
 #!BuildTag: suse/rmt-server:latest
-#!BuildName: suse-rmt-server-%%rmt_version%%
+#!BuildName: suse-rmt-server
 #!BuildVersion: 15.5
 FROM suse/sle15:15.5
 

diff --git a/ruby-2.5-image/Dockerfile b/ruby-2.5-image/Dockerfile
@@ -21,7 +21,7 @@
 #!BuildTag: bci/ruby:latest
 #!BuildName: bci-ruby-2.5
 #!BuildVersion: 15.5.2.5
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git 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.5.1.76.2
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/rust-stable-image/Dockerfile b/rust-stable-image/Dockerfile
@@ -21,7 +21,7 @@
 #!BuildTag: bci/rust:latest
 #!BuildName: bci-rust-stable
 #!BuildVersion: 15.5.1.77.1
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/sle15-kernel-module-devel-image/Dockerfile b/sle15-kernel-module-devel-image/Dockerfile
@@ -19,7 +19,7 @@
 #!BuildTag: bci/bci-sle15-kernel-module-devel:latest
 #!BuildName: bci-bci-sle15-kernel-module-devel-%OS_VERSION_ID_SP%
 #!BuildVersion: 15.5
-FROM suse/sle15:15.5
+FROM bci/bci-base:15.5
 
 MAINTAINER SUSE LLC (https://www.suse.com/)
 

diff --git a/tomcat-10-image/README.md b/tomcat-10-image/README.md
@@ -23,7 +23,7 @@ To deploy an application, copy the `.war` file file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.suse.com/suse/tomcat:10
+$ podman run -d --rm -p 8080:8080 registry.suse.com/suse/tomcat:latest
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -40,7 +40,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.suse.com/suse/tomcat:10
+      -p 8080:8080 registry.suse.com/suse/tomcat:latest
 ```
 
 
@@ -56,7 +56,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.suse.com/suse/tomcat:10
+      registry.suse.com/suse/tomcat:latest
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`