Skip to content

Commit

Permalink
Update docker instructions
Browse files Browse the repository at this point in the history
A few things have changed since these Dockerfiles where introduced:
* The choria registry has changed;
* The choria image is now based on AlmaLinux 9;
* Puppet 8 is required to run choria.

While here, make builds somewhat more reproducible by setting an
explicit choria version.
  • Loading branch information
smortex committed Sep 27, 2024
1 parent 48725ef commit 9eea4a8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions misc/Dockerfile-choria-enroll
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM choria/choria
FROM registry.choria.io/choria/choria:0.29.4

USER root

# Puppet is required for task input validation
RUN yum -y install wget && \
wget 'https://yum.puppetlabs.com/puppet7-release-el-8.noarch.rpm' && \
rpm -i puppet7-release-el-8.noarch.rpm && \
wget 'https://yum.puppetlabs.com/puppet8-release-el-9.noarch.rpm' && \
rpm -i puppet8-release-el-9.noarch.rpm && \
yum -y install puppet-agent

RUN /opt/puppetlabs/puppet/bin/gem install --bindir /opt/puppetlabs/bin choria-mcorpc-support
Expand Down
6 changes: 3 additions & 3 deletions misc/Dockerfile-mco
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM choria/choria
FROM registry.choria.io/choria/choria:0.29.4

USER root

# Puppet is required for task input validation
RUN yum -y install wget && \
wget 'https://yum.puppetlabs.com/puppet7-release-el-8.noarch.rpm' && \
rpm -i puppet7-release-el-8.noarch.rpm && \
wget 'https://yum.puppetlabs.com/puppet8-release-el-9.noarch.rpm' && \
rpm -i puppet8-release-el-9.noarch.rpm && \
yum -y install puppet-agent

RUN /opt/puppetlabs/puppet/bin/gem install --bindir /opt/puppetlabs/bin choria-mcorpc-support
Expand Down

0 comments on commit 9eea4a8

Please sign in to comment.