Drop puppet 6 and add puppet 8 to rocky Dockerfiles

This module requires puppet 7 or greater, so drop references to puppet6 and
earlier.

Update `puppet module install` to install correct dependencies.

Author: joshcooper

docker/bin/helpers/run-upgrade.sh

@@ -1,32 +1,26 @@
 #!/usr/bin/env bash
 
-# Run upgrades on a container. The default upgrade TO argument will be 6.2.0 if
+# Run upgrades on a container. The default upgrade TO argument will be 8.10.0 if
 # no arguments are passed to this script.
 set -e
 
-to_version=${1:-6.2.0}
+to_version=${1:-8.10.0}
 # Calculate which collection should be used. This is derived from the puppet
 # version.
 puppet_version=( ${to_version//./ } )
 puppet_major=${puppet_version[0]}
 case $puppet_major in
-4)
-    to_collection=PC1
-    ;;
-5)
-    to_collection=puppet5
-    ;;
-6)
-    to_collection=puppet6
-    ;;
 7)
     to_collection=puppet7
     ;;
+8)
+    to_collection=puppet8
+    ;;
 *)
     echo "Invalid version supplied" 1>&2
     exit 1
 esac
-FACTER_to_version=${1:-6.2.0} FACTER_to_collection=${to_collection} /opt/puppetlabs/puppet/bin/puppet apply --debug --trace --modulepath /tmp/modules /tmp/upgrade.pp
+FACTER_to_version=${1:-8.10.0} FACTER_to_collection=${to_collection} /opt/puppetlabs/puppet/bin/puppet apply --debug --trace --modulepath /tmp/modules /tmp/upgrade.pp
 # Make e.g. `puppet --version` work out of the box.
 PATH=/opt/puppetlabs/bin:$PATH \
     read -p "Explore the upgraded container? [y/N]: " choice && \

docker/bin/upgrade.sh

@@ -19,8 +19,8 @@ set -e
 
 cd "$(dirname "$0")/../.."
 platforms=${1:-ubuntu}
-before=${2:-1.10.14}
-after=${3:-6.2.0}
+before=${2:-7.34.0}
+after=${3:-8.10.0}
 for platform in ${platforms//,/ }
 do
     docker build --rm -f docker/$platform/Dockerfile . -t pa-dev:$platform \

docker/rocky/Dockerfile

@@ -22,7 +22,7 @@
 # This specifies the versions that were used for upgrade.
 #
 # Arguments:
-# - before: The version to do upgrade FROM. Default: "1.10.14"
+# - before: The version to do upgrade FROM. Default: "7.34.0"
 
 FROM rockylinux/rockylinux:8
 
@@ -34,15 +34,11 @@ RUN  dnf update -y \
   && dnf install -y wget git \
   && dnf clean all
 
-ARG before=1.10.14
+ARG before=7.34.0
 LABEL before=${before}
 
-# Install proper FROM repo: puppet 6 or puppet 7.
-RUN if [[ ${before} == 6.* ]]; then \
-        echo Installing puppet6 repo; \
-        wget -O puppet6.rpm http://yum.puppet.com/puppet6-release-el-8.noarch.rpm && \
-        rpm -i puppet6.rpm; \
-    elif [[ ${before} == 7.* ]]; then \
+# Install proper FROM repo pupet 7
+RUN if [[ ${before} == 7.* ]]; then \
         echo Installing puppet7 repo; \
         wget -O puppet7.rpm http://yum.puppet.com/puppet7-release-el-8.noarch.rpm && \
         rpm -i puppet7.rpm; \
@@ -67,13 +63,14 @@ COPY metadata.json ./
 RUN /opt/puppetlabs/puppet/bin/puppet module install --modulepath $module_path --target-dir .. puppetlabs-stdlib
 RUN /opt/puppetlabs/puppet/bin/puppet module install --modulepath $module_path --target-dir .. puppetlabs-inifile
 RUN /opt/puppetlabs/puppet/bin/puppet module install --modulepath $module_path --target-dir .. puppetlabs-apt
+RUN /opt/puppetlabs/puppet/bin/puppet module install --modulepath $module_path --target-dir .. puppetlabs-facts
 
 # Installing dependencies from source. These versions should be within the range
-# of `dependencies` in metadata.json. `translate` is a dependency for inifile.
-#RUN git clone https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib --branch 5.2.0
-#RUN git clone https://github.com/puppetlabs/puppetlabs-inifile ../inifile --branch 2.5.0
-#RUN git clone https://github.com/puppetlabs/puppetlabs-translate ../translate --branch 1.2.0
-#RUN git clone https://github.com/puppetlabs/puppetlabs-apt ../apt --branch 6.3.0
+# of `dependencies` in metadata.json.
+#RUN git clone https://github.com/puppetlabs/puppetlabs-stdlib ../stdlib --branch 9.7.0
+#RUN git clone https://github.com/puppetlabs/puppetlabs-inifile ../inifile --branch 6.2.0
+#RUN git clone https://github.com/puppetlabs/puppetlabs-apt ../apt --branch 10.0.1
+#RUN git clone https://github.com/puppetlabs/puppetlabs-facts ../facts --branch 1.7.0
 
 # Check that all dependencies are installed.
 RUN /opt/puppetlabs/puppet/bin/puppet module --modulepath $module_path list --tree

docker/rocky/Dockerfile.versions

@@ -5,11 +5,11 @@ RUN  dnf update -y \
   && dnf install -y wget git \
   && dnf clean all
 
-# Install several repos: puppet 6, and puppet7.
-RUN wget -O puppet6.rpm http://yum.puppet.com/puppet6-release-el-8.noarch.rpm && \
-    rpm -i puppet6.rpm --force --replacefiles --nodeps && \
-    wget -O puppet7.rpm http://yum.puppet.com/puppet7-release-el-8.noarch.rpm && \
-    rpm -i puppet7.rpm --force --replacefiles --nodeps
+# Install several repos: puppet 7 and 8
+RUN wget -O puppet7.rpm http://yum.puppet.com/puppet7-release-el-8.noarch.rpm && \
+    rpm -i puppet7.rpm --force --replacefiles --nodeps && \
+    wget -O puppet8.rpm http://yum.puppet.com/puppet8-release-el-8.noarch.rpm && \
+    rpm -i puppet8.rpm --force --replacefiles --nodeps
 
 # Print out available package versions for puppet-agent. If a specific version
 # is desired, pass that in with e.g. `--build-arg before=1.1.1`