Merge pull request #51 from opus-codium/update-docker-instructions

Update docker instructions
opus-codium · Sep 28, 2024 · 5d60c43 · 5d60c43
2 parents 48725ef + 9eea4a8
commit 5d60c43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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