Dockerfile

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: (LGPL-2.1+ AND GPL-2.0+)
 
-#     Copyright (c) 2025 SUSE LLC
+#     Copyright (c) 2024 SUSE LLC
 
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,23 +13,22 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 # You can contact the BCI team via https://github.com/SUSE/bci/discussions
 
-#!UseOBSRepositories
 
-#!BuildTag: opensuse/pcp:6.2.1-%RELEASE%
 #!BuildTag: opensuse/pcp:6.2.1
+#!BuildTag: opensuse/pcp:6.2.1-%RELEASE%
 #!BuildTag: opensuse/pcp:6.2
+#!BuildTag: opensuse/pcp:6.2-%RELEASE%
 #!BuildTag: opensuse/pcp:6
+#!BuildTag: opensuse/pcp:6-%RELEASE%
 #!BuildTag: opensuse/pcp:latest
 
 FROM opensuse/bci/bci-init:latest
 
-RUN set -euo pipefail; \
+RUN set -euo pipefail; zypper -n in --no-recommends pcp hostname procps shadow envsubst util-linux-systemd; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
-    zypper -n install --no-recommends pcp hostname procps shadow envsubst util-linux-systemd; \
-    zypper -n clean; \
-    rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.pcp
+LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 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="6.2.1"
@@ -46,7 +45,7 @@ LABEL org.opensuse.release-stage="released"
 LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/pcp-image/README.md"
 ENTRYPOINT ["/usr/local/bin/container-entrypoint"]
 CMD ["/usr/lib/systemd/systemd"]
-EXPOSE 44321/tcp 44322/tcp 44323/tcp
+EXPOSE 44321 44322 44323
 
 RUN set -euo pipefail; mkdir -p /usr/share/container-scripts/pcp; mkdir -p /etc/sysconfig
 COPY container-entrypoint healthcheck /usr/local/bin/

_scmsync.obsinfo

@@ -1,5 +0,0 @@
-mtime: 1735740828
-commit: 8720cff6b7dc48da6eab529ec066581a09603659
-url: https://github.com/SUSE/bci-dockerfile-generator
-revision: Tumbleweed
-subdir: pcp-image

_service

@@ -1,13 +1,13 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service mode="buildtime" name="replace_using_package_version">
+  <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pcp_major%%</param>
     <param name="package">pcp</param>
     <param name="parse-version">major</param>
   </service>
-  <service mode="buildtime" name="replace_using_package_version">
+  <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pcp_minor%%</param>
     <param name="package">pcp</param>

pcp-image.changes

@@ -1,53 +1,3 @@
--------------------------------------------------------------------
-Wed Jan  1 14:13:48 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
-
-- update copyright year
-
--------------------------------------------------------------------
-Tue Dec  3 13:26:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- Change attribute order in _service
-
--------------------------------------------------------------------
-Mon Nov 25 07:33:17 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- Fix spelling mistakes
-
--------------------------------------------------------------------
-Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- be explicit in protocol for expose statement
-
--------------------------------------------------------------------
-Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- remove nonsensical org.opencontainers.image.authors - duplication of .vendor
-
--------------------------------------------------------------------
-Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- make the tag with -%RELEASE% the first tag listed
-
--------------------------------------------------------------------
-Wed Sep 25 17:36:16 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- rerender installation step in multiple lines, allow uninstalling optional packages
-
--------------------------------------------------------------------
-Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- improved log cleaning
-
--------------------------------------------------------------------
-Tue Sep 24 20:00:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- remove release tags for additional_versions
-
--------------------------------------------------------------------
-Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- set useobsrepositories explicitly
-
 -------------------------------------------------------------------
 Wed Aug 14 12:30:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 

pmproxy.conf.template

@@ -42,7 +42,7 @@ secure.enabled = true
 #####################################################################
 [discover]
 
-# propagate archives from pmlogger(1) into Redis querying
+# propogate archives from pmlogger(1) into Redis querying
 enabled = true
 
 # comma-separated metrics name (globs) to skip during discovery
@@ -63,7 +63,7 @@ enabled = true
 count = 10
 
 #####################################################################
-## settings for fast, scalable time series querying via Redis
+## settings for fast, scalable time series quering via Redis
 [pmseries]
 #####################################################################