docker-puppet.py: move entrypoint mount to latest in order

Put the entrypoint bind as the last one so to be sure it is accessible.
See https://github.com/containers/libpod/issues/1844#issuecomment-451442611

Change-Id: I5a9dbbee5fde81c3f7ecc41a557f15d54d6e070a
This commit is contained in:
Emilien Macchi 2019-01-04 14:40:52 +01:00
parent 2e37e7e22f
commit b1d34c98bc

@ -414,9 +414,7 @@ def mp_puppet_config(*args):
'--volume', '/etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro',
'--volume', '%s:/var/lib/config-data/:rw' % config_volume_prefix,
# Syslog socket for puppet logs
'--volume', '/dev/log:/dev/log:rw',
# script injection
'--volume', '%s:%s:ro' % (sh_script, sh_script) ]
'--volume', '/dev/log:/dev/log:rw']
if privileged:
common_dcmd.push('--privileged')
@ -444,6 +442,11 @@ def mp_puppet_config(*args):
log.debug('NET_HOST enabled')
dcmd.extend(['--net', 'host', '--volume',
'/etc/hosts:/etc/hosts:ro'])
# script injection as the last mount to make sure it's accessible
# https://github.com/containers/libpod/issues/1844
dcmd.extend(['--volume', '%s:%s:ro' % (sh_script, sh_script)])
dcmd.append(config_image)
log.debug('Running %s command: %s' % (container_cli, ' '.join(dcmd)))