From ba1b7bdee78d32bd18b7777a092fc5dbc09cedcd Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Wed, 11 Sep 2024 16:48:02 +1000 Subject: [PATCH] [fix-variable-expansion] Make curl calls consistent. --- images/awx-ee/execution-environment.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 98a328e5..81404681 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -70,27 +70,27 @@ additional_build_steps: - 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 - - RUN curl -L https://github.com/itchyny/gojq/releases/download/v$GOJQ_VERSION/gojq_v$GOJQ_VERSION_linux_amd64.tar.gz --output /tmp/gojq_v$GOJQ_VERSION_linux_amd64.tar.gz + - RUN curl -L "https://github.com/itchyny/gojq/releases/download/v$GOJQ_VERSION/gojq_v$GOJQ_VERSION_linux_amd64.tar.gz" --output /tmp/gojq_v$GOJQ_VERSION_linux_amd64.tar.gz - RUN tar -C /tmp -xvf /tmp/gojq_v$GOJQ_VERSION_linux_amd64.tar.gz - RUN chmod +x /tmp/gojq_v$GOJQ_VERSION_linux_amd64/gojq - 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 -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 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 SHELL ["/bin/bash", "-c"] RUN set -eux; \ - curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \ + curl -fsSL "https://cli.github.com/packages/githubcli-archive-keyring.gpg" | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \ && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \ && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ && apt update \