Changes committed to git://git.pcp.io/pcp.git master
Mark Goodwin (1):
Build PCP container images using the bintray RPM repo matching
fedora:latest.
Marko Myllynen (1):
docs: update pmrep man pages for global config file
build/containers/pcp-base/Dockerfile | 25 +++++++++++++++++++------
build/containers/pcp-collector/Dockerfile | 2 +-
build/containers/pcp-monitor/Dockerfile | 2 +-
build/containers/pcp-pmie/Dockerfile | 2 +-
build/containers/pcp-pmlogger/Dockerfile | 2 +-
build/containers/pcp-testsuite/Dockerfile | 2 +-
src/pmrep/pmrep.1 | 3 +++
src/pmrep/pmrep.conf.5 | 3 +++
8 files changed, 30 insertions(+), 11 deletions(-)
commit b726fec39b982d00b15422efed7c384984351e46
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Mon Jan 4 20:23:02 2016 +1100
docs: update pmrep man pages for global config file
As pmrep.conf is now installed universally (not just on Fedora/RHEL),
mention it on the man pages as well.
commit fc33729d6cd26c690f9529ecada93ad85d12335b
Author: Mark Goodwin <mgoodwin@xxxxxxxxxx>
Date: Mon Dec 21 17:21:50 2015 +1000
Build PCP container images using the bintray RPM repo matching
fedora:latest.
Previously the default was to build container images based on 'pcp-devel',
which is a repo constructed from the just-built PCP RPMs, which are copied
to /tmp/RPMS inside the pcp-base container image, and thus available to all
container images based on pcp-base. This option is still available, see
comments in build/containers/pcp-base/Dockerfile, but no longer the default.
The default now uses the latest Fedora base image from the default Docker
repository (docker.io/fedora:latest) to determine the Fedora base image
version (by looking in /etc/redhat-release), and matches this up with the
latest PCP repo on bintray for that version of Fedora. This is currently
f23 (fedora:latest), but adapts automatically as new versions of Fedora
are released, at which time the base image will be updated.
Future work will allow use of other base images (e.g. Debian, RHEL, etc)
via Makepkgs command line options, and automatically use the correct bintray
PCP repo for the nominated base image.
modified: build/containers/pcp-base/Dockerfile
modified: build/containers/pcp-collector/Dockerfile
modified: build/containers/pcp-monitor/Dockerfile
modified: build/containers/pcp-pmie/Dockerfile
modified: build/containers/pcp-pmlogger/Dockerfile
modified: build/containers/pcp-testsuite/Dockerfile
|