From ba573cf1c504aff34a16709b5a838ad3df7257d7 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Wed, 1 Dec 2021 22:38:03 +0000 Subject: [PATCH] Update to deploy using r10k --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4fd6e01..99cf3ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM vshn/puppet-mcoclient +FROM vshn/puppet-mcoclient:6.23 USER root # Cache busting -ADD https://api.github.com/repos/optiz0r/puppet-env-manager-agent/git/refs/heads/master version.json -# Install puppet-env-manager plugin -RUN git clone https://github.com/optiz0r/puppet-env-manager-agent \ - && cp -r puppet-env-manager-agent/agent/* /opt/puppetlabs/mcollective/plugins/mcollective/agent/ \ - && rm -rf puppet-env-manager-agent +ADD https://api.github.com/repos/voxpupuli/puppet-r10k/git/refs/heads/master version.json +# Install r10k plugin +RUN git clone https://github.com/voxpupuli/puppet-r10k.git \ + && cp -r puppet-r10k/files/mcollective/agent/* /opt/puppetlabs/mcollective/plugins/mcollective/agent/ \ + && rm -rf puppet-r10k -RUN echo "security.serializer = json" >> /etc/puppetlabs/mcollective/plugin.d/choria.cfg +RUN echo "security.serializer = json" >> /etc/choria/plugin.d/choria.cfg USER $MCO_CLIENT_USER WORKDIR /home/$MCO_CLIENT_USER \ No newline at end of file