Merge branch 'develop' into 3320-ssp-cat3

raft-tech · Dec 5, 2024 · 7df4027 · 7df4027
2 parents 241844c + 52653f2
commit 7df4027
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml
@@ -226,6 +226,7 @@
         default: CF_APP
     steps:
       - checkout
+      - sudo-check
       - cf-check
       - login-cloud-dot-gov:
           cf-password: <<parameters.cf-password>>

diff --git a/scripts/cf-check.sh b/scripts/cf-check.sh
@@ -4,9 +4,10 @@ if command -v cf /dev/null 2>&1; then
     echo The command cf is available
 else
     if [[ -f /bin/terraform ]]; then
-        echo "This is our Terraform executor"
+        echo "This is our Terraform executor, Alpine Linux v3.13"
         apk update
-        apk install curl jq
+        apk add curl jq
+
     else
         apt-get update
         apt-get install curl wget gnupg2 apt-transport-https jq
@@ -18,5 +19,4 @@ else
     tar xzf $NEXUS_ARCHIVE
     mv ./cf7 /usr/local/bin/cf
     cf --version
-
 fi
diff --git a/scripts/sudo-check.sh b/scripts/sudo-check.sh
@@ -4,6 +4,12 @@ if command -v sudo /dev/null 2>&1; then
     echo The command sudo is available
 else
     echo The command sudo is not available installing...
-    apt-get update && apt-get install -y sudo
-    ls -al /bin/sh && sudo rm /bin/sh && sudo ln -s /bin/bash /bin/sh && ls -al /bin/sh
+    if [ -f /bin/terraform ]; then
+        echo "This is our Terraform executor, Alpine Linux v3.13"
+        apk update
+        apk add sudo
+    else
+        apt-get update && apt-get install -y sudo
+        ls -al /bin/sh && sudo rm /bin/sh && sudo ln -s /bin/bash /bin/sh && ls -al /bin/sh
+    fi
 fi