Merge pull request #91 from OctopusDeploy/enh-packaging-adjustments

Restrict sensitive RedHat variables to RedHat containers
OctopusDeploy · Jul 1, 2020 · 830d6c9 · 830d6c9
2 parents d50b222 + 0a22757
commit 830d6c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/BuildAssets/repos/test-linux-package-from-feed-in-dists.sh b/BuildAssets/repos/test-linux-package-from-feed-in-dists.sh
@@ -23,6 +23,12 @@ SCRIPT_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 
 for DOCKER_IMAGE in $(cat "$LPF_PATH/test-env-docker-images.conf" | grep -o '^[^#]*' | tr -d '\r')
 do
+  if [[ "$DOCKER_IMAGE" == *rhel* ]]; then
+    RHEL_OPTS='--env REDHAT_SUBSCRIPTION_USERNAME --env REDHAT_SUBSCRIPTION_PASSWORD'
+  else
+    RHEL_OPTS=''
+  fi
+
   echo "== Testing in '$DOCKER_IMAGE' =="
   docker pull "$DOCKER_IMAGE" >/dev/null || exit
   docker run --rm \
@@ -31,6 +37,6 @@ do
     --volume "$(realpath "$LPF_PATH"):/opt/linux-package-feeds" \
     --env PUBLISH_LINUX_EXTERNAL \
     --env OCTOPUS_CLI_SERVER --env OCTOPUS_CLI_API_KEY --env OCTOPUS_SPACE --env OCTOPUS_EXPECT_ENV \
-    --env REDHAT_SUBSCRIPTION_USERNAME --env REDHAT_SUBSCRIPTION_PASSWORD \
+    $RHEL_OPTS \
     "$DOCKER_IMAGE" bash -c 'cd /working && bash /test-linux-package-from-feed.sh' || exit
 done
diff --git a/BuildAssets/test-linux-package-in-dists.sh b/BuildAssets/test-linux-package-in-dists.sh
@@ -23,13 +23,19 @@ SCRIPT_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 
 for DOCKER_IMAGE in $(cat "$LPF_PATH/test-env-docker-images.conf" | grep -o '^[^#]*' | tr -d '\r')
 do
+  if [[ "$DOCKER_IMAGE" == *rhel* ]]; then
+    RHEL_OPTS='--env REDHAT_SUBSCRIPTION_USERNAME --env REDHAT_SUBSCRIPTION_PASSWORD'
+  else
+    RHEL_OPTS=''
+  fi
+
   echo "== Testing in '$DOCKER_IMAGE' =="
   docker pull "$DOCKER_IMAGE" >/dev/null || exit
   docker run --rm \
     --hostname "octotestpkg$RANDOM" \
     --volume "$(pwd):/working" --volume "$SCRIPT_DIR/test-linux-package.sh:/test-linux-package.sh" \
     --volume "$(realpath "$LPF_PATH"):/opt/linux-package-feeds" \
     --env OCTOPUS_CLI_SERVER --env OCTOPUS_CLI_API_KEY --env OCTOPUS_SPACE --env OCTOPUS_EXPECT_ENV \
-    --env REDHAT_SUBSCRIPTION_USERNAME --env REDHAT_SUBSCRIPTION_PASSWORD \
+    $RHEL_OPTS \
     "$DOCKER_IMAGE" bash -c 'cd /working && bash /test-linux-package.sh' || exit
 done