Skip to content

Commit 3002e79

Browse files
author
SUSE Update Bot
committed
Test build for #1429
1 parent d5da8f2 commit 3002e79

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

pcp-image/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#!BuildTag: opensuse/pcp:6.2.1-%RELEASE%
1919
#!BuildTag: opensuse/pcp:6.2.1
20+
#!BuildTag: opensuse/pcp:6
2021
#!BuildTag: opensuse/pcp:6.2
2122
#!BuildTag: opensuse/pcp:6
2223
#!BuildTag: opensuse/pcp:latest

pcp-image/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $ podman run -d \
1313
-p 44321:44321 \
1414
-p 44322:44322 \
1515
-v pcp-archives:/var/log/pcp/pmlogger \
16-
registry.opensuse.org/opensuse/pcp:6.2.1
16+
registry.opensuse.org/opensuse/pcp:6
1717
```
1818

1919
**Note:** On SELinux enabled systems, the following boolean needs to be set: `sudo setsebool -P container_manage_cgroup true`
@@ -29,7 +29,7 @@ $ sudo podman run -d \
2929
-e HOST_MOUNT=/host \
3030
-v pcp-archives:/var/log/pcp/pmlogger \
3131
-v /:/host:ro,rslave \
32-
registry.opensuse.org/opensuse/pcp:6.2.1
32+
registry.opensuse.org/opensuse/pcp:6
3333
```
3434

3535
## Configuration
@@ -64,7 +64,7 @@ $ podman run -d \
6464
-e PCP_SERVICES=pmlogger \
6565
-v $(pwd)/pmlogger.control:/etc/pcp/pmlogger/control.d/local:z \
6666
-v pcp-archives:/var/log/pcp/pmlogger \
67-
registry.opensuse.org/opensuse/pcp:6.2.1
67+
registry.opensuse.org/opensuse/pcp:6
6868
```
6969

7070
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)