Accepting request 1178840 from devel:BCI:Tumbleweed

🤖: sync package with devel:BCI:Tumbleweed from OBS

OBS-URL: https://build.opensuse.org/request/show/1178840
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcp-image?expand=0&rev=10

Dockerfile

@@ -14,12 +14,12 @@
 # You can contact the BCI team via https://github.com/SUSE/bci/discussions
 
 
-#!BuildTag: opensuse/pcp:%%pcp_patch%%
+#!BuildTag: opensuse/pcp:6.2.1
-#!BuildTag: opensuse/pcp:%%pcp_patch%%-%RELEASE%
+#!BuildTag: opensuse/pcp:6.2.1-%RELEASE%
-#!BuildTag: opensuse/pcp:%%pcp_minor%%
+#!BuildTag: opensuse/pcp:6.2
-#!BuildTag: opensuse/pcp:%%pcp_minor%%-%RELEASE%
+#!BuildTag: opensuse/pcp:6.2-%RELEASE%
-#!BuildTag: opensuse/pcp:%%pcp_major%%
+#!BuildTag: opensuse/pcp:6
-#!BuildTag: opensuse/pcp:%%pcp_major%%-%RELEASE%
+#!BuildTag: opensuse/pcp:6-%RELEASE%
 #!BuildTag: opensuse/pcp:latest
 
 FROM opensuse/bci/bci-init:latest
@@ -30,18 +30,17 @@ MAINTAINER openSUSE (https://www.opensuse.org/)
 # labelprefix=org.opensuse.application.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%%"
+LABEL org.opencontainers.image.version="6.2.1"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
-LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/pcp-image/README.md"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/pcp:6.2.1-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/pcp:%%pcp_patch%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
 LABEL org.opensuse.release-stage="released"
-
 # endlabelprefix
+LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/pcp-image/README.md"
 
 RUN set -euo pipefail; zypper -n in --no-recommends pcp hostname shadow gettext-runtime util-linux-systemd; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 ENTRYPOINT ["/usr/local/bin/container-entrypoint"]

README.md

@@ -14,7 +14,7 @@ $ podman run -d \
     -p 44321:44321 \
     -p 44322:44322 \
     -v pcp-archives:/var/log/pcp/pmlogger \
-    registry.opensuse.org/opensuse/pcp:%%pcp_patch%%
+    registry.opensuse.org/opensuse/pcp:6.2.1
 ```
 
 **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.opensuse.org/opensuse/pcp:%%pcp_patch%%
+    registry.opensuse.org/opensuse/pcp:6.2.1
 ```
 
 ## 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.opensuse.org/opensuse/pcp:%%pcp_patch%%
+    registry.opensuse.org/opensuse/pcp:6.2.1
 ```
 
 pmlogger.control:

_service

@@ -13,10 +13,4 @@
     <param name="package">pcp</param>
     <param name="parse-version">minor</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">Dockerfile</param>
-    <param name="regex">%%pcp_patch%%</param>
-    <param name="package">pcp</param>
-    <param name="parse-version">patch</param>
-  </service>
 </services>

pcp-image.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jun  5 15:13:27 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- Don't add artifacthub labels into labelprefix section
+
+-------------------------------------------------------------------
+Wed Jun  5 12:47:22 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- Hardcode package version in the README
+
 -------------------------------------------------------------------
 Tue Jun  4 12:35:15 UTC 2024 - Alexandre Vicenzi <alexandre.vicenzi@suse.com>