Compare commits

2 Commits
master ... r10k

Author SHA1 Message Date
Ben Roberts
52d3380c88 Include r10k mco application 2021-12-01 23:24:12 +00:00
Ben Roberts
ba573cf1c5 Update to deploy using r10k 2021-12-01 22:38:03 +00:00

View File

@@ -1,15 +1,16 @@
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/ \
&& cp -r puppet-r10k/files/mcollective/application/* /opt/puppetlabs/mcollective/plugins/mcollective/application/ \
&& 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