Skip to content

Commit 99ee4c1

Browse files
committed
(maint) Allow PUPPET_FORGE_USERNAME to be passed into the running docker container
Previously, when running docker/bin/install.sh, you couldn't pass `license-id` as it was hardcoded to `forge-key`.
1 parent 981472a commit 99ee4c1

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

docker/bin/helpers/run-install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ fi
2727
export PT__installdir=../
2828
export PT_version=${to_version}
2929
export PT_collection=${to_collection}
30+
export PT_username=${PUPPET_FORGE_USERNAME}
3031
export PT_password=${PUPPET_FORGE_TOKEN}
3132
chmod u+x tasks/install_shell.sh
3233
tasks/install_shell.sh

docker/bin/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ do
7272
# Add "--progress plain" for complete build output
7373
docker build --rm -f "${dockerfile}" . -t pa-dev:$platform.install \
7474
--build-arg BASE_IMAGE="${base_image}"
75-
docker run -e PUPPET_FORGE_TOKEN --rm -ti pa-dev:$platform.install "${version}" "${collection}"
75+
docker run -e PUPPET_FORGE_USERNAME -e PUPPET_FORGE_TOKEN --rm -ti pa-dev:$platform.install "${version}" "${collection}"
7676
done
7777
echo Complete

0 commit comments

Comments
 (0)