Allow collection to be passed into install

Author: joshcooper

docker/bin/helpers/run-install.sh

@@ -7,19 +7,22 @@ if [[ -z "${to_version}" ]]; then
     echo "$0: The version to install must be passed as an argument"
     exit 1
 fi
+to_collection="$2"
 puppet_version=( ${to_version//./ } )
 puppet_major=${puppet_version[0]}
-case $puppet_major in
-    7)
-        to_collection=puppetcore7
-        ;;
-    8)
-        to_collection=puppetcore8
-        ;;
-    *)
-        echo "$0: Invalid version supplied" 1>&2
-        exit 1
-esac
+if [[ -z "$to_collection" ]]; then
+    case $puppet_major in
+        7)
+            to_collection=puppetcore7
+            ;;
+        8)
+            to_collection=puppetcore8
+            ;;
+        *)
+            echo "$0: Invalid version supplied" 1>&2
+            exit 1
+    esac
+fi
 
 export PT__installdir=../
 export PT_version=${to_version}

docker/bin/install.sh

@@ -27,6 +27,7 @@ fi
 cd "$(dirname "$0")/../.."
 platforms=${1:-rocky}
 version=${2:-8.11.0}
+collection=${3:-puppetcore8}
 for platform in ${platforms//,/ }
 do
     case $platform in
@@ -70,6 +71,6 @@ do
     # Add "--progress plain" for complete build output
     docker build --rm -f "${dockerfile}" . -t pa-dev:$platform.install \
            --build-arg BASE_IMAGE="${base_image}"
-    docker run -e PUPPET_FORGE_TOKEN --rm -ti pa-dev:$platform.install "${version}"
+    docker run -e PUPPET_FORGE_TOKEN --rm -ti pa-dev:$platform.install "${version}" "${collection}"
 done
 echo Complete