From 1b8618159e54d7d43861c12f7a48d4fbeea847fd Mon Sep 17 00:00:00 2001 From: Emilien Macchi <emilien@redhat.com> Date: Thu, 1 Nov 2018 14:25:57 -0400 Subject: [PATCH] docker-puppet: remove -z from /var/lib/config-data mount Context: https://github.com/containers/libpod/issues/1739 The relabeling of /var/lib/config-data fails with Podman and since we run the docker-puppet containers with label=disable, we shouldn't need to relabel it anyway. Change-Id: I5e0715a9b7a052126fb01c8d2c3da36a38bec2bf Related-Bug: #1800737 --- docker/docker-puppet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index ab3c97519a..942c12862b 100644 --- a/docker/docker-puppet.py +++ b/docker/docker-puppet.py @@ -378,7 +378,7 @@ def mp_puppet_config(*args): '--volume', '/etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro', '--volume', '/etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro', '--volume', '/etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro', - '--volume', '%s:/var/lib/config-data/:rw,z' % config_volume_prefix, + '--volume', '%s:/var/lib/config-data/:rw' % config_volume_prefix, # Syslog socket for puppet logs '--volume', '/dev/log:/dev/log:rw', # script injection