From 9eea4a809e326fff973d078e31f0c8f84121ebbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Fri, 27 Sep 2024 10:59:51 -1000 Subject: [PATCH] Update docker instructions 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. --- misc/Dockerfile-choria-enroll | 6 +++--- misc/Dockerfile-mco | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/misc/Dockerfile-choria-enroll b/misc/Dockerfile-choria-enroll index c354591..b783a3b 100644 --- a/misc/Dockerfile-choria-enroll +++ b/misc/Dockerfile-choria-enroll @@ -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 diff --git a/misc/Dockerfile-mco b/misc/Dockerfile-mco index b6cbd25..fe99f84 100644 --- a/misc/Dockerfile-mco +++ b/misc/Dockerfile-mco @@ -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