[fix-var-expansion] Refactored method of var assignment.

dpc-sdp · Sep 12, 2024 · fc1b401 · fc1b401
1 parent 9c088ae
commit fc1b401
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml
@@ -61,16 +61,16 @@ additional_build_steps:
       SHELL ["/bin/bash", "-c"]
       RUN set -eux; \
           arch_linux=$(uname -m) && arch_linux="${arch_linux/aarch64/arm64}" && arch_linux="${arch_linux/x86_64/amd64}"; \
-          curl -LO "https://dl.k8s.io/release/v$KUBECTL_VERSION/bin/linux/${arch_linux}/kubectl"; \
+          curl -LO "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${arch_linux}/kubectl"; \
           chmod +x kubectl; \
           mv ./kubectl /usr/local/bin/kubectl;
 
-    - RUN curl -L "https://github.com/uselagoon/lagoon-cli/releases/download/$LAGOON_CLI_VERSION/lagoon-cli-$LAGOON_CLI_VERSION-linux-amd64" -o /usr/local/bin/lagoon
+    - RUN curl -L "https://github.com/uselagoon/lagoon-cli/releases/download/${LAGOON_CLI_VERSION}/lagoon-cli-${LAGOON_CLI_VERSION}-linux-amd64" -o /usr/local/bin/lagoon
     - RUN chmod +x /usr/local/bin/lagoon
-    - RUN curl -L "https://github.com/github/hub/releases/download/v$HUB_VERSION/hub-linux-amd64-$HUB_VERSION.tgz" -o /tmp/hub && tar -xvf /tmp/hub -C /tmp && mv /tmp/hub-linux-amd64-$HUB_VERSION/bin/hub /usr/local/bin
+    - RUN curl -L "https://github.com/github/hub/releases/download/v${HUB_VERSION}/hub-linux-amd64-${HUB_VERSION}.tgz" -o /tmp/hub && tar -xvf /tmp/hub -C /tmp && mv /tmp/hub-linux-amd64-${HUB_VERSION}/bin/hub /usr/local/bin
     - RUN chmod +x /usr/local/bin/hub
     - RUN lagoon config feature --enable-local-dir-check false --force
-    - RUN curl -sS "https://getcomposer.org/download/$COMPOSER_VERSION/composer.phar" --output composer.phar
+    - RUN curl -sS "https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar" --output composer.phar
     - RUN chmod +x composer.phar
     - RUN mv composer.phar /usr/local/bin/composer
     - RUN composer global require szeidler/composer-patches-cli:^1.0
@@ -80,11 +80,11 @@ additional_build_steps:
     - RUN mv /tmp/gojq_v${GOJQ_VERSION}_linux_amd64/gojq /usr/local/bin
     - RUN touch /runner/.bashrc && chmod +x /runner/.bashrc
     - RUN mkdir -p /runner/.nvm && chgrp 0 /runner/.nvm && chmod -R ug+rwx /runner/.nvm
-    - RUN curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$NVM_INSTALL_VERSION/install.sh" | PROFILE="/runner/.bashrc" bash
-    - RUN curl -L "https://get.helm.sh/helm-v$HELM_VERSION-linux-amd64.tar.gz" -o /tmp/helm && tar -xvf /tmp/helm -C /tmp && mv /tmp/linux-amd64/helm /usr/local/bin
+    - RUN curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_INSTALL_VERSION}/install.sh" | PROFILE="/runner/.bashrc" bash
+    - RUN curl -L "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" -o /tmp/helm && tar -xvf /tmp/helm -C /tmp && mv /tmp/linux-amd64/helm /usr/local/bin
     - RUN chmod +x /usr/local/bin/helm
-    - RUN curl -L "https://github.com/google/yamlfmt/releases/download/v$YAMLFMT_VERSION/yamlfmt_$YAMLFMT_VERSION_Linux_x86_64.tar.gz" --output /tmp/yamlfmt_$YAMLFMT_VERSION_Linux_x86_64.tar.gz
-    - RUN tar -C /tmp -xvf /tmp/yamlfmt_$YAMLFMT_VERSION_Linux_x86_64.tar.gz
+    - RUN curl -L "https://github.com/google/yamlfmt/releases/download/v${YAMLFMT_VERSION}/yamlfmt_${YAMLFMT_VERSION}_Linux_x86_64.tar.gz" --output /tmp/yamlfmt_${YAMLFMT_VERSION}_Linux_x86_64.tar.gz
+    - RUN tar -C /tmp -xvf /tmp/yamlfmt_${YAMLFMT_VERSION}_Linux_x86_64.tar.gz
     - RUN chmod +x /tmp/yamlfmt
     - RUN mv /tmp/yamlfmt /usr/local/bin
     - | # Install GitHub gh cli tool