Merge remote-tracking branch 'upstream/main' into use_heredocs

ci-conda.Dockerfile

@@ -110,7 +110,6 @@ RUN wget https://github.com/rapidsai/gha-tools/releases/latest/download/tools.ta
 RUN <<EOF
 rapids-mamba-retry install -y \
   anaconda-client \
-  awscli \
   boa \
   gettext \
   gh \
@@ -156,6 +155,8 @@ RUN /opt/conda/bin/git config --system --add safe.directory '*'
 RUN pip install dunamai "rapids-dependency-file-generator==1.*" \
     && pip cache purge
 
-COPY --from=mikefarah/yq:4.35.2 /usr/bin/yq /usr/local/bin/yq
+COPY --from=mikefarah/yq:4.40.3 /usr/bin/yq /usr/local/bin/yq
+COPY --from=amazon/aws-cli /usr/local/aws-cli/ /usr/local/aws-cli/
+COPY --from=amazon/aws-cli /usr/local/bin/ /usr/local/bin/
 
 CMD ["/bin/bash"]

ci-wheel.Dockerfile

@@ -209,15 +209,8 @@ pip cache purge
 EOF
 
 # Install the AWS CLI
-RUN <<EOF
-mkdir -p /aws_install
-cd /aws_install
-curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
-unzip awscli-bundle.zip
-./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
-cd /
-rm -rf /aws_install
-EOF
+COPY --from=amazon/aws-cli /usr/local/aws-cli/ /usr/local/aws-cli/
+COPY --from=amazon/aws-cli /usr/local/bin/ /usr/local/bin/
 
 # Mark all directories as safe for git so that GHA clones into the root don't
 # run into issues

citestwheel.Dockerfile

@@ -52,16 +52,8 @@ ENV PATH="/pyenv/versions/${PYTHON_VER}/bin/:$PATH"
 
 # Install the AWS CLI
 # Needed to download wheels for running tests
-# Install the AWS CLI
-RUN <<EOF
-mkdir -p /aws_install
-cd /aws_install
-curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
-unzip awscli-bundle.zip
-./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
-cd /
-rm -rf /aws_install
-EOF
+COPY --from=amazon/aws-cli /usr/local/aws-cli/ /usr/local/aws-cli/
+COPY --from=amazon/aws-cli /usr/local/bin/ /usr/local/bin/
 
 # Install latest gha-tools
 RUN wget https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz -O - \