Skip to content

Commit 3f28adb

Browse files
author
SUSE Update Bot
committed
Test build for #1429
1 parent c3e430e commit 3f28adb

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

pcp-image/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717

1818
#!BuildTag: suse/pcp:6.2.0-%RELEASE%
1919
#!BuildTag: suse/pcp:6.2.0
20+
#!BuildTag: suse/pcp:6
2021
#!BuildTag: suse/pcp:6.2
2122
#!BuildTag: suse/pcp:6
22-
#!BuildName: suse-pcp-6.2.0
23-
#!BuildVersion: 15.7.6.2.0
23+
#!BuildName: suse-pcp-6
24+
#!BuildVersion: 15.7.6
2425
FROM bci/bci-init:15.7
2526

2627
RUN set -euo pipefail; \

pcp-image/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $ podman run -d \
1414
-p 44321:44321 \
1515
-p 44322:44322 \
1616
-v pcp-archives:/var/log/pcp/pmlogger \
17-
registry.suse.com/suse/pcp:6.2.0
17+
registry.suse.com/suse/pcp:6
1818
```
1919

2020
**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 \
3030
-e HOST_MOUNT=/host \
3131
-v pcp-archives:/var/log/pcp/pmlogger \
3232
-v /:/host:ro,rslave \
33-
registry.suse.com/suse/pcp:6.2.0
33+
registry.suse.com/suse/pcp:6
3434
```
3535

3636
## Configuration
@@ -65,7 +65,7 @@ $ podman run -d \
6565
-e PCP_SERVICES=pmlogger \
6666
-v $(pwd)/pmlogger.control:/etc/pcp/pmlogger/control.d/local:z \
6767
-v pcp-archives:/var/log/pcp/pmlogger \
68-
registry.suse.com/suse/pcp:6.2.0
68+
registry.suse.com/suse/pcp:6
6969
```
7070

7171
pmlogger.control:

pcp-image/_service

-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
11
<services>
22
<service mode="buildtime" name="docker_label_helper"/>
33
<service mode="buildtime" name="kiwi_metainfo_helper"/>
4-
<service name="replace_using_package_version" mode="buildtime">
5-
<param name="file">Dockerfile</param>
6-
<param name="regex">%%pcp_major%%</param>
7-
<param name="package">pcp</param>
8-
<param name="parse-version">major</param>
9-
</service>
10-
<service name="replace_using_package_version" mode="buildtime">
11-
<param name="file">Dockerfile</param>
12-
<param name="regex">%%pcp_minor%%</param>
13-
<param name="package">pcp</param>
14-
<param name="parse-version">minor</param>
15-
</service>
164
</services>

0 commit comments

Comments
 (0)