Merge pull request #8144 from cbosdo/containers-tagging

Fix the reference label in container images
uyuni-project · Jan 12, 2024 · f6ea17d · f6ea17d
2 parents f346641 + 358913d
commit f6ea17d
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 11 deletions.
diff --git a/containers/hub-xmlrpc-api-image/Dockerfile b/containers/hub-xmlrpc-api-image/Dockerfile
@@ -14,14 +14,16 @@ ARG REFERENCE_PREFIX="registry.opensuse.org/uyuni"
 
 # Build Service required labels
 # labelprefix=org.opensuse.uyuni.hub-xmlrpc-api
+LABEL org.opencontainers.image.name=hub-xmlrpc-api-image
 LABEL org.opencontainers.image.title="${PRODUCT} Hub XML-RPC API container"
 LABEL org.opencontainers.image.description="${PRODUCT} Hub XML-RPC API image"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
-LABEL org.opencontainers.image.version="5.0.0"
+LABEL org.opencontainers.image.version=5.0.0
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server:5.0.0.%RELEASE%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/hub-xmlrpc-api:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix
+LABEL org.uyuni.version="${PRODUCT_VERSION}"
 
 CMD ["/usr/bin/hub-xmlrpc-api"]
diff --git a/containers/hub-xmlrpc-api-image/hub-xmlrpc-api.changes.cbosdonnat.versions-fix b/containers/hub-xmlrpc-api-image/hub-xmlrpc-api.changes.cbosdonnat.versions-fix
@@ -0,0 +1,2 @@
+- Use product version in reference label
+- Add missing image name label
diff --git a/containers/init-image/Dockerfile b/containers/init-image/Dockerfile
@@ -52,7 +52,7 @@ LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.version=5.0.1
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="${REFERENCE_PREFIX}/init:5.0.1.%RELEASE%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/init:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix
 
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD ["/usr/bin/systemctl", "is-active", "multi-user.target"]
diff --git a/containers/init-image/init-image.changes.cbosdonnat.versions-fix b/containers/init-image/init-image.changes.cbosdonnat.versions-fix
@@ -0,0 +1,2 @@
+- Use product version in reference label
+- Fix the container version labels
diff --git a/containers/proxy-httpd-image/Dockerfile b/containers/proxy-httpd-image/Dockerfile
@@ -52,8 +52,9 @@ LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-httpd-image
 LABEL org.opencontainers.image.version=5.0.0
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-httpd:5.0.0.%RELEASE%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-httpd:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix
+LABEL org.uyuni.version="${PRODUCT_VERSION}"
 
 # http(s)
 EXPOSE 80/tcp

diff --git a/containers/proxy-httpd-image/proxy-httpd-image.changes.cbosdonnat.versions-fix b/containers/proxy-httpd-image/proxy-httpd-image.changes.cbosdonnat.versions-fix
@@ -0,0 +1 @@
+- Use product version in reference label
diff --git a/containers/proxy-salt-broker-image/Dockerfile b/containers/proxy-salt-broker-image/Dockerfile
@@ -43,8 +43,9 @@ LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-salt-broker-image
 LABEL org.opencontainers.image.version=5.0.0
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-salt-broker:5.0.0.%RELEASE%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-salt-broker:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix
+LABEL org.uyuni.version="${PRODUCT_VERSION}"
 
 # Salt
 EXPOSE 4505/tcp

diff --git a/containers/proxy-salt-broker-image/proxy-salt-broker-image.changes.cbosdonnat.versions-fix b/containers/proxy-salt-broker-image/proxy-salt-broker-image.changes.cbosdonnat.versions-fix
@@ -0,0 +1 @@
+- Use product version in reference label
diff --git a/containers/proxy-squid-image/Dockerfile b/containers/proxy-squid-image/Dockerfile
@@ -57,8 +57,9 @@ LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-squid-image
 LABEL org.opencontainers.image.version=5.0.0
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-squid:5.0.0.%RELEASE%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-squid:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix
+LABEL org.uyuni.version="${PRODUCT_VERSION}"
 
 # Squid
 EXPOSE 8080/tcp

diff --git a/containers/proxy-squid-image/proxy-squid-image.changes.cbosdonnat.versions-fix b/containers/proxy-squid-image/proxy-squid-image.changes.cbosdonnat.versions-fix
@@ -0,0 +1 @@
+- Use product version in reference label
diff --git a/containers/proxy-ssh-image/Dockerfile b/containers/proxy-ssh-image/Dockerfile
@@ -48,8 +48,9 @@ LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-ssh-image
 LABEL org.opencontainers.image.version=5.0.0
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-ssh:5.0.0.%RELEASE%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-ssh:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix
+LABEL org.uyuni.version="${PRODUCT_VERSION}"
 
 # SSH port
 EXPOSE 22

diff --git a/containers/proxy-ssh-image/proxy-ssh-image.changes.cbosdonnat.versions-fix b/containers/proxy-ssh-image/proxy-ssh-image.changes.cbosdonnat.versions-fix
@@ -0,0 +1 @@
+- Use product version in reference label
diff --git a/containers/proxy-tftpd-image/Dockerfile b/containers/proxy-tftpd-image/Dockerfile
@@ -47,8 +47,9 @@ LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.name=proxy-tftpd-image
 LABEL org.opencontainers.image.version=5.0.0
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-tftpd:5.0.0.%RELEASE%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/proxy-tftpd:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix
+LABEL org.uyuni.version="${PRODUCT_VERSION}"
 
 # tftp
 EXPOSE 69/udp

diff --git a/containers/proxy-tftpd-image/proxy-tftpd-image.changes.cbosdonnat.versions-fix b/containers/proxy-tftpd-image/proxy-tftpd-image.changes.cbosdonnat.versions-fix
@@ -0,0 +1 @@
+- Use product version in reference label
diff --git a/containers/server-image/Dockerfile b/containers/server-image/Dockerfile
@@ -91,8 +91,9 @@ LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.version=5.0.0
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server:5.0.0.%RELEASE%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix
+LABEL org.uyuni.version="${PRODUCT_VERSION}"
 
 CMD ["/usr/lib/systemd/systemd"]
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD ["/usr/bin/systemctl", "is-active", "multi-user.target"]
diff --git a/containers/server-image/server-image.changes.cbosdonnat.versions-fix b/containers/server-image/server-image.changes.cbosdonnat.versions-fix
@@ -0,0 +1 @@
+- Use product version in reference label
diff --git a/containers/server-migration-14-16-image/Dockerfile b/containers/server-migration-14-16-image/Dockerfile
@@ -20,14 +20,15 @@ ARG REFERENCE_PREFIX="registry.opensuse.org/uyuni"
 
 # Build Service required labels
 # labelprefix=org.opensuse.uyuni.server-migration-14-16
-LABEL org.opencontainers.image.name=server-migration-image
+LABEL org.opencontainers.image.name=server-migration-14-16-image
 LABEL org.opencontainers.image.title="${PRODUCT} server migration container"
 LABEL org.opencontainers.image.description="${PRODUCT} server migration image"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="${VENDOR}"
 LABEL org.opencontainers.image.url="${URL}"
 LABEL org.opencontainers.image.version=5.0.0
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server-migration:5.0.0.%RELEASE%"
+LABEL org.opensuse.reference="${REFERENCE_PREFIX}/server-migration:${PRODUCT_VERSION}.%RELEASE%"
 # endlabelprefix
+LABEL org.uyuni.version="${PRODUCT_VERSION}"
 
diff --git a/containers/server-migration-14-16-image/server-migration-14-16-image.changes b/containers/server-migration-14-16-image/server-migration-14-16-image.changes
diff --git a/...server-migration-14-16-image/server-migration-14-16-image.changes.cbosdonnat.versions-fix b/...server-migration-14-16-image/server-migration-14-16-image.changes.cbosdonnat.versions-fix
@@ -0,0 +1 @@
+- Use product version in reference label