Test build for #949

SUSE · Apr 23, 2024 · 4ce9fd7 · 4ce9fd7
1 parent f21074f
commit 4ce9fd7
Show file tree

Hide file tree

Showing 61 changed files with 50 additions and 618 deletions.
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -161,10 +161,6 @@ staging_build:
         source_project: home:defolos:BCI:CR:Tumbleweed
         source_package: distribution-image
         target_project: home:defolos:BCI:CR:Tumbleweed:Staging
-    - branch_package:
-        source_project: home:defolos:BCI:CR:Tumbleweed
-        source_package: rmt-nginx-image
-        target_project: home:defolos:BCI:CR:Tumbleweed:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:Tumbleweed
         source_package: rmt-server-image
@@ -330,9 +326,6 @@ refresh_devel_BCI:
     - trigger_services:
         project: devel:BCI:Tumbleweed
         package: distribution-image
-    - trigger_services:
-        project: devel:BCI:Tumbleweed
-        package: rmt-nginx-image
     - trigger_services:
         project: devel:BCI:Tumbleweed
         package: rmt-server-image

diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER [email protected]
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.389-ds
+# labelprefix=org.opensuseapplication.389-ds
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed 389 Directory Server"
 LABEL org.opencontainers.image.description="389 Directory Server container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%389ds_version%%"

diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.alertmanager
+# labelprefix=org.opensuseapplication.alertmanager
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Alertmanager"
 LABEL org.opencontainers.image.description="Alertmanager container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%alertmanager_version%%"

diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.blackbox_exporter
+# labelprefix=org.opensuseapplication.blackbox_exporter
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Blackbox Exporter"
 LABEL org.opencontainers.image.description="Blackbox Exporter container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%blackbox_exporter_version%%"

diff --git a/busybox-image/busybox-image.kiwi b/busybox-image/busybox-image.kiwi
@@ -31,7 +31,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
-          <suse_label_helper:add_prefix prefix="org.opensuse.bci.busybox">
+          <suse_label_helper:add_prefix prefix="org.opensusebci.busybox">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI openSUSE Tumbleweed BusyBox"/>
             <label name="org.opencontainers.image.description" value="openSUSE Tumbleweed BusyBox container based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>

diff --git a/distribution-image/distribution-image.kiwi b/distribution-image/distribution-image.kiwi
@@ -32,7 +32,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
           user="registry"
           additionaltags="%%registry_version%%-%RELEASE%,latest">
         <labels>
-          <suse_label_helper:add_prefix prefix="org.opensuse.application.registry">
+          <suse_label_helper:add_prefix prefix="org.opensuseapplication.registry">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed OCI Container Registry (Distribution)"/>
             <label name="org.opencontainers.image.description" value="OCI Container Registry (Distribution) container based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%%registry_version%%"/>

diff --git a/gcc-12-image/Dockerfile b/gcc-12-image/Dockerfile
@@ -24,7 +24,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.gcc
+# labelprefix=org.opensusebci.gcc
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI GNU Compiler Collection"
 LABEL org.opencontainers.image.description="GNU Compiler Collection container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="12"

diff --git a/gcc-12-image/README.md b/gcc-12-image/README.md
@@ -87,7 +87,7 @@ podman run --rm -it -v $(pwd):/src/:Z --workdir /src/ \
 
 Note that the binary built using this approach are unlikely to work on a local
 machine. They only work on operating systems that are binary-compatible to
-.
+openSUSE Tumbleweed.
 
 ## Licensing
 `SPDX-License-Identifier: MIT`

diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile
@@ -24,7 +24,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.gcc
+# labelprefix=org.opensusebci.gcc
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI GNU Compiler Collection"
 LABEL org.opencontainers.image.description="GNU Compiler Collection container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="13"

diff --git a/gcc-13-image/README.md b/gcc-13-image/README.md
@@ -88,7 +88,7 @@ podman run --rm -it -v $(pwd):/src/:Z --workdir /src/ \
 
 Note that the binary built using this approach are unlikely to work on a local
 machine. They only work on operating systems that are binary-compatible to
-.
+openSUSE Tumbleweed.
 
 ## Licensing
 `SPDX-License-Identifier: MIT`

diff --git a/gcc-14-image/Dockerfile b/gcc-14-image/Dockerfile
@@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.gcc
+# labelprefix=org.opensusebci.gcc
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI GNU Compiler Collection"
 LABEL org.opencontainers.image.description="GNU Compiler Collection container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="14"

diff --git a/gcc-14-image/README.md b/gcc-14-image/README.md
@@ -89,7 +89,7 @@ podman run --rm -it -v $(pwd):/src/:Z --workdir /src/ \
 
 Note that the binary built using this approach are unlikely to work on a local
 machine. They only work on operating systems that are binary-compatible to
-.
+openSUSE Tumbleweed.
 
 ## Licensing
 `SPDX-License-Identifier: MIT`

diff --git a/git-image/git-image.kiwi b/git-image/git-image.kiwi
@@ -31,7 +31,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%%git_version%%-%RELEASE%,latest">
         <labels>
-          <suse_label_helper:add_prefix prefix="org.opensuse.application.git">
+          <suse_label_helper:add_prefix prefix="org.opensuseapplication.git">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed openSUSE Tumbleweed with Git"/>
             <label name="org.opencontainers.image.description" value="A micro environment with Git based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%%git_version%%"/>

diff --git a/gitea-runner-image/Dockerfile b/gitea-runner-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.gitea-runner
+# labelprefix=org.opensusebci.gitea-runner
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Gitea Action Runner"
 LABEL org.opencontainers.image.description="Gitea Action Runner container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%.%RELEASE%"

diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -24,7 +24,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.golang
+# labelprefix=org.opensusebci.golang
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.21 development"
 LABEL org.opencontainers.image.description="Go 1.21 development container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="1.21"

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.golang
+# labelprefix=org.opensusebci.golang
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.22 development"
 LABEL org.opencontainers.image.description="Go 1.22 development container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="1.22"

diff --git a/grafana-image/Dockerfile b/grafana-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.grafana
+# labelprefix=org.opensuseapplication.grafana
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Grafana"
 LABEL org.opencontainers.image.description="Grafana container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%grafana_version%%"

diff --git a/helm-image/helm-image.kiwi b/helm-image/helm-image.kiwi
@@ -31,7 +31,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%%helm_version%%-%RELEASE%,latest">
         <labels>
-          <suse_label_helper:add_prefix prefix="org.opensuse.application.helm">
+          <suse_label_helper:add_prefix prefix="org.opensuseapplication.helm">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed Kubernetes Package Manager"/>
             <label name="org.opencontainers.image.description" value="Kubernetes Package Manager container based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%%helm_version%%"/>

diff --git a/init-image/Dockerfile b/init-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.init
+# labelprefix=org.opensusebci.init
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI openSUSE Tumbleweed Init"
 LABEL org.opencontainers.image.description="Systemd environment for containers based on the openSUSE Tumbleweed Base Container Image. This container is only supported with podman."
 LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%.%RELEASE%"

diff --git a/mariadb-client-image/Dockerfile b/mariadb-client-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.mariadb-client
+# labelprefix=org.opensuseapplication.mariadb-client
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Client"
 LABEL org.opencontainers.image.description="MariaDB Client container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%mariadb_version%%"

diff --git a/mariadb-image/Dockerfile b/mariadb-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.mariadb
+# labelprefix=org.opensuseapplication.mariadb
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Server"
 LABEL org.opencontainers.image.description="MariaDB Server container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%mariadb_version%%"

diff --git a/micro-image/micro-image.kiwi b/micro-image/micro-image.kiwi
@@ -31,7 +31,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
-          <suse_label_helper:add_prefix prefix="org.opensuse.bci.micro">
+          <suse_label_helper:add_prefix prefix="org.opensusebci.micro">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI openSUSE Tumbleweed Micro"/>
             <label name="org.opencontainers.image.description" value="A micro environment for containers based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>

diff --git a/minimal-image/minimal-image.kiwi b/minimal-image/minimal-image.kiwi
@@ -31,7 +31,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
-          <suse_label_helper:add_prefix prefix="org.opensuse.bci.minimal">
+          <suse_label_helper:add_prefix prefix="org.opensusebci.minimal">
             <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI openSUSE Tumbleweed Minimal"/>
             <label name="org.opencontainers.image.description" value="openSUSE Tumbleweed Minimal container based on the openSUSE Tumbleweed Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>

diff --git a/nginx-image/Dockerfile b/nginx-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.nginx
+# labelprefix=org.opensuseapplication.nginx
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed NGINX"
 LABEL org.opencontainers.image.description="NGINX open source all-in-one load balancer, content cache and web server based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%nginx_version%%"

diff --git a/nodejs-20-image/Dockerfile b/nodejs-20-image/Dockerfile
@@ -26,7 +26,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.nodejs
+# labelprefix=org.opensusebci.nodejs
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Node.js 20 development"
 LABEL org.opencontainers.image.description="Node.js 20 development container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="20"

diff --git a/openjdk-11-devel-image/Dockerfile b/openjdk-11-devel-image/Dockerfile
@@ -22,7 +22,7 @@ FROM opensuse/bci/openjdk:11
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.openjdk.devel
+# labelprefix=org.opensusebci.openjdk.devel
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 11 development"
 LABEL org.opencontainers.image.description="OpenJDK 11 development container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="11"

diff --git a/openjdk-11-image/Dockerfile b/openjdk-11-image/Dockerfile
@@ -22,7 +22,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.openjdk
+# labelprefix=org.opensusebci.openjdk
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 11 runtime"
 LABEL org.opencontainers.image.description="OpenJDK 11 runtime container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="11"

diff --git a/openjdk-17-devel-image/Dockerfile b/openjdk-17-devel-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/bci/openjdk:17
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.openjdk.devel
+# labelprefix=org.opensusebci.openjdk.devel
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 17 development"
 LABEL org.opencontainers.image.description="OpenJDK 17 development container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="17"

diff --git a/openjdk-17-image/Dockerfile b/openjdk-17-image/Dockerfile
@@ -23,7 +23,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.openjdk
+# labelprefix=org.opensusebci.openjdk
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 17 runtime"
 LABEL org.opencontainers.image.description="OpenJDK 17 runtime container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="17"

diff --git a/openjdk-21-devel-image/Dockerfile b/openjdk-21-devel-image/Dockerfile
@@ -22,7 +22,7 @@ FROM opensuse/bci/openjdk:21
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.openjdk.devel
+# labelprefix=org.opensusebci.openjdk.devel
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 21 development"
 LABEL org.opencontainers.image.description="OpenJDK 21 development container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="21"

diff --git a/openjdk-21-image/Dockerfile b/openjdk-21-image/Dockerfile
@@ -22,7 +22,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.openjdk
+# labelprefix=org.opensusebci.openjdk
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI OpenJDK 21 runtime"
 LABEL org.opencontainers.image.description="OpenJDK 21 runtime container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="21"

diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -27,7 +27,7 @@ FROM opensuse/bci/bci-init:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.pcp
+# labelprefix=org.opensuseapplication.pcp
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed Performance Co-Pilot (pcp)"
 LABEL org.opencontainers.image.description="Performance Co-Pilot (pcp) container based on the openSUSE Tumbleweed Base Container Image. This container is only supported with podman."
 LABEL org.opencontainers.image.version="%%pcp_patch%%"

diff --git a/php-apache8-image/Dockerfile b/php-apache8-image/Dockerfile
@@ -22,7 +22,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.php-apache
+# labelprefix=org.opensusebci.php-apache
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI PHP-Apache 8"
 LABEL org.opencontainers.image.description="PHP-Apache 8 container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="8"

diff --git a/php-fpm8-image/Dockerfile b/php-fpm8-image/Dockerfile
@@ -22,7 +22,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.php-fpm
+# labelprefix=org.opensusebci.php-fpm
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI PHP-FPM 8"
 LABEL org.opencontainers.image.description="PHP-FPM 8 container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="8"

diff --git a/php8-image/Dockerfile b/php8-image/Dockerfile
@@ -22,7 +22,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.bci.php
+# labelprefix=org.opensusebci.php
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI PHP 8"
 LABEL org.opencontainers.image.description="PHP 8 container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="8"

diff --git a/postgres-12-image/Dockerfile b/postgres-12-image/Dockerfile
@@ -24,7 +24,7 @@ FROM opensuse/tumbleweed:latest
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
-# labelprefix=org.opensuse.application.postgres
+# labelprefix=org.opensuseapplication.postgres
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 12"
 LABEL org.opencontainers.image.description="PostgreSQL 12 container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="12"