Upgrading my f22 system pulled in an updated docker (to 1.7.1), and broke
our PCP containers. This fixes it. The container images on bintray have
this fix - I cherry picked it before building the container images (which
are still based on 3.10.6 apart from this fix. It's akin to a fedora spec
fix basically).
Changes committed to git://pcp.io/markgw/pcp/pcp.git master
commit bafb33eac6226fc92c3a3da424581184b7d3e765
Author: Mark Goodwin <mgoodwin@xxxxxxxxxx>
Date: Wed Aug 5 15:09:49 2015 +1000
containers: remove /proc bind mount, it conflicts with --pid=host
Docker v1.7.1 doesn't allow -v /proc:/proc and --pid=host since this
is a redundant and conflicting configuration. Remove the bind mount.
modified: build/containers/pcp-collector/Dockerfile
modified: build/containers/pcp-monitor/Dockerfile
modified: build/containers/pcp-pmlogger/Dockerfile
modified: build/containers/pcp-testsuite/Dockerfile
|