From 57ba9958db494a3d33f6d832533c31fc395c9e40 Mon Sep 17 00:00:00 2001
From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com>
Date: Wed, 28 Feb 2024 10:13:24 -0600
Subject: [PATCH 1/8] Configure regex manager for unreachable dependencies
 (#108)

---
 README.md                | 14 ++++++++++++++
 ci-conda.Dockerfile      | 24 ++++++++++++++++--------
 ci-wheel.Dockerfile      | 24 ++++++++++++++----------
 ci/compute-build-args.sh | 25 ++++++++++++++-----------
 citestwheel.Dockerfile   |  8 ++++++--
 renovate.json            | 11 +++++++++++
 versions.yaml            | 12 ++++++++++++
 7 files changed, 87 insertions(+), 31 deletions(-)
 create mode 100644 versions.yaml

diff --git a/README.md b/README.md
index bb65579..4bdde05 100644
--- a/README.md
+++ b/README.md
@@ -9,3 +9,17 @@ This repository includes the following CI images for RAPIDS:
 ## `latest` tag
 
 The `latest` image tags are controlled by the values in `latest.yaml`.
+
+## Building the dockerfiles locally
+
+To easily build the dockerfiles locally, you may use the following snippets:
+
+```sh
+export LINUX_VER=ubuntu22.04
+export CUDA_VER=12.2.2
+export PYTHON_VER=3.11
+export ARCH=amd64
+docker build $(ci/compute-build-args.sh) -f ci-conda.Dockerfile context/
+docker build $(ci/compute-build-args.sh) -f ci-wheel.Dockerfile context/
+docker build $(ci/compute-build-args.sh) -f citestwheel.Dockerfile context/
+```
diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile
index 7eed28e..c89df6f 100644
--- a/ci-conda.Dockerfile
+++ b/ci-conda.Dockerfile
@@ -1,6 +1,13 @@
 ARG CUDA_VER=notset
 ARG LINUX_VER=notset
 ARG PYTHON_VER=notset
+ARG YQ_VER
+ARG AWS_CLI_VER
+
+FROM mikefarah/yq:${YQ_VER} as yq
+
+FROM amazon/aws-cli:${AWS_CLI_VER} as aws-cli
+
 FROM rapidsai/miniforge-cuda:cuda${CUDA_VER}-base-${LINUX_VER}-py${PYTHON_VER}
 
 ARG TARGETPLATFORM
@@ -93,6 +100,7 @@ esac
 EOF
 
 # Install gha-tools
+ARG SCCACHE_VER
 RUN wget https://github.com/rapidsai/gha-tools/releases/latest/download/tools.tar.gz -O - \
   | tar -xz -C /usr/local/bin
 
@@ -105,21 +113,21 @@ rapids-mamba-retry install -y \
   gh \
   git \
   jq \
-  "sccache==0.7.6" \
+  "sccache==${SCCACHE_VER}" \
   "python=${PYTHON_VERSION}.*=*_cpython"
 conda clean -aipty
 EOF
 
 # Install codecov binary
+ARG CODECOV_VER
 RUN <<EOF
 case "${TARGETPLATFORM}" in
   "linux/amd64")
-    CODECOV_VERSION=v0.3.2
     curl https://uploader.codecov.io/verification.gpg --max-time 10 --retry 5 \
       | gpg --no-default-keyring --keyring trustedkeys.gpg --import
-    curl -Os --max-time 10 --retry 5 https://uploader.codecov.io/${CODECOV_VERSION}/linux/codecov
-    curl -Os --max-time 10 --retry 5 https://uploader.codecov.io/${CODECOV_VERSION}/linux/codecov.SHA256SUM
-    curl -Os --max-time 10 --retry 5 https://uploader.codecov.io/${CODECOV_VERSION}/linux/codecov.SHA256SUM.sig
+    curl -Os --max-time 10 --retry 5 https://uploader.codecov.io/v${CODECOV_VER}/linux/codecov
+    curl -Os --max-time 10 --retry 5 https://uploader.codecov.io/v${CODECOV_VER}/linux/codecov.SHA256SUM
+    curl -Os --max-time 10 --retry 5 https://uploader.codecov.io/v${CODECOV_VER}/linux/codecov.SHA256SUM.sig
     gpgv codecov.SHA256SUM.sig codecov.SHA256SUM
     shasum -a 256 -c codecov.SHA256SUM
     chmod +x codecov
@@ -145,8 +153,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.41.1 /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/
+COPY --from=yq /usr/bin/yq /usr/local/bin/yq
+COPY --from=aws-cli /usr/local/aws-cli/ /usr/local/aws-cli/
+COPY --from=aws-cli /usr/local/bin/ /usr/local/bin/
 
 CMD ["/bin/bash"]
diff --git a/ci-wheel.Dockerfile b/ci-wheel.Dockerfile
index 6576bbb..04a2613 100644
--- a/ci-wheel.Dockerfile
+++ b/ci-wheel.Dockerfile
@@ -2,6 +2,10 @@ ARG CUDA_VER=notset
 ARG LINUX_VER=notset
 
 ARG BASE_IMAGE=nvcr.io/nvidia/cuda:${CUDA_VER}-devel-${LINUX_VER}
+ARG AWS_CLI_VER
+
+FROM amazon/aws-cli:${AWS_CLI_VER} as aws-cli
+
 FROM ${BASE_IMAGE}
 
 ARG CUDA_VER
@@ -108,24 +112,24 @@ case "${LINUX_VER}" in
 esac
 EOF
 
-# Download and install GH CLI tool v2.32.0
-ARG GH_VERSION=2.32.0
+# Download and install GH CLI tool
+ARG GH_CLI_VER=notset
 RUN <<EOF
 set -e
-wget https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_${CPU_ARCH}.tar.gz
+wget https://github.com/cli/cli/releases/download/v${GH_CLI_VER}/gh_${GH_CLI_VER}_linux_${CPU_ARCH}.tar.gz
 tar -xf gh_*.tar.gz
 mv gh_*/bin/gh /usr/local/bin
 rm -rf gh_*
 EOF
 
 # Install sccache
-ARG SCCACHE_VERSION=0.7.6
+ARG SCCACHE_VER=notset
 
 RUN <<EOF
 curl -o /tmp/sccache.tar.gz \
-  -L "https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/sccache-v${SCCACHE_VERSION}-"${REAL_ARCH}"-unknown-linux-musl.tar.gz"
+  -L "https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VER}/sccache-v${SCCACHE_VER}-"${REAL_ARCH}"-unknown-linux-musl.tar.gz"
 tar -C /tmp -xvf /tmp/sccache.tar.gz
-mv "/tmp/sccache-v${SCCACHE_VERSION}-"${REAL_ARCH}"-unknown-linux-musl/sccache" /usr/bin/sccache
+mv "/tmp/sccache-v${SCCACHE_VER}-"${REAL_ARCH}"-unknown-linux-musl/sccache" /usr/bin/sccache
 chmod +x /usr/bin/sccache
 EOF
 
@@ -134,11 +138,11 @@ ENV AUDITWHEEL_POLICY=${POLICY} AUDITWHEEL_ARCH=${REAL_ARCH} AUDITWHEEL_PLAT=${P
 
 
 # Install ucx
-ARG UCX_VERSION=1.14.1
+ARG UCX_VER=notset
 RUN <<EOF
 mkdir -p /ucx-src
 cd /ucx-src
-git clone https://github.com/openucx/ucx -b v${UCX_VERSION} ucx-git-repo
+git clone https://github.com/openucx/ucx -b v${UCX_VER} ucx-git-repo
 cd ucx-git-repo
 ./autogen.sh
 ./contrib/configure-release \
@@ -199,8 +203,8 @@ pip cache purge
 EOF
 
 # Install the AWS CLI
-COPY --from=amazon/aws-cli /usr/local/aws-cli/ /usr/local/aws-cli/
-COPY --from=amazon/aws-cli /usr/local/bin/ /usr/local/bin/
+COPY --from=aws-cli /usr/local/aws-cli/ /usr/local/aws-cli/
+COPY --from=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
diff --git a/ci/compute-build-args.sh b/ci/compute-build-args.sh
index 75ca6d6..881b747 100755
--- a/ci/compute-build-args.sh
+++ b/ci/compute-build-args.sh
@@ -13,19 +13,22 @@ elif [[
   MANYLINUX_VER="manylinux_2_28"
 fi
 
-ARGS=(
-  # common args
-  "CUDA_VER=${CUDA_VER}"
-  "LINUX_VER=${LINUX_VER}"
-  "PYTHON_VER=${PYTHON_VER}"
-  # wheel args
-  "CPU_ARCH=${ARCH}"
-  "REAL_ARCH=$(arch)"
-  "MANYLINUX_VER=${MANYLINUX_VER}"
-)
+ARGS="
+CUDA_VER: ${CUDA_VER}
+LINUX_VER: ${LINUX_VER}
+PYTHON_VER: ${PYTHON_VER}
+CPU_ARCH: ${ARCH}
+REAL_ARCH: $(arch)
+MANYLINUX_VER: ${MANYLINUX_VER}
+"
+export ARGS
 
+if [ -n "${GITHUB_ACTIONS:-}" ]; then
 cat <<EOF > "${GITHUB_OUTPUT:-/dev/stdout}"
 ARGS<<EOT
-$(printf "%s\n" "${ARGS[@]}")
+$(yq -r '. + env(ARGS) | to_entries | map(.key + "=" + .value) | join(" \n")' versions.yaml)
 EOT
 EOF
+else
+  yq -r '. + env(ARGS) | to_entries | map("--build-arg " + .key + "=" + .value) | join(" ")' versions.yaml
+fi
diff --git a/citestwheel.Dockerfile b/citestwheel.Dockerfile
index 5d87720..da3e80d 100644
--- a/citestwheel.Dockerfile
+++ b/citestwheel.Dockerfile
@@ -2,6 +2,10 @@ ARG CUDA_VER=notset
 ARG LINUX_VER=notset
 
 ARG BASE_IMAGE=nvcr.io/nvidia/cuda:${CUDA_VER}-devel-${LINUX_VER}
+ARG AWS_CLI_VER
+
+FROM amazon/aws-cli:${AWS_CLI_VER} as aws-cli
+
 FROM ${BASE_IMAGE}
 
 ARG CUDA_VER
@@ -52,8 +56,8 @@ ENV PATH="/pyenv/versions/${PYTHON_VER}/bin/:$PATH"
 
 # Install the AWS CLI
 # Needed to download wheels for running tests
-COPY --from=amazon/aws-cli /usr/local/aws-cli/ /usr/local/aws-cli/
-COPY --from=amazon/aws-cli /usr/local/bin/ /usr/local/bin/
+COPY --from=aws-cli /usr/local/aws-cli/ /usr/local/aws-cli/
+COPY --from=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 - \
diff --git a/renovate.json b/renovate.json
index 39a2b6e..3c2e727 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,5 +2,16 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base"
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": "renovate.yaml",
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>[^ ]+) depName=(?<depName>[^\\n]+)(?: versioning=(?<versioning>[^\\n]+))?\\n(?<depNameCapture>[^:]+): (?<currentValue>[^\\n]+)"
+      ],
+      "depNameTemplate": "{{depName}}",
+      "datasourceTemplate": "{{datasource}}",
+      "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
+    }
   ]
 }
diff --git a/versions.yaml b/versions.yaml
new file mode 100644
index 0000000..65ecb37
--- /dev/null
+++ b/versions.yaml
@@ -0,0 +1,12 @@
+# renovate: datasource=github-releases depName=mozilla/sccache
+SCCACHE_VER: 0.7.6
+# renovate: datasource=github-releases depName=cli/cli
+GH_CLI_VER: 2.32.0
+# renovate: datasource=github-releases depName=codecov/uploader
+CODECOV_VER: 0.3.2
+# renovate: datasource=docker depName=mikefarah/yq
+YQ_VER: 4.41.1
+# renovate: datasource=github-releases depName=openucx/ucx
+UCX_VER: 1.14.1
+# renovate: datasource=docker depName=amazon/aws-cli versioning=docker
+AWS_CLI_VER: 2.15.9

From 2ae14fdbf1092d4a61abe50386cc9da6bebcce89 Mon Sep 17 00:00:00 2001
From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com>
Date: Wed, 28 Feb 2024 11:52:36 -0600
Subject: [PATCH 2/8] fix wrong fileMatch target (#117)

[skip ci]
---
 renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 3c2e727..d399c67 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,7 +5,7 @@
   ],
   "regexManagers": [
     {
-      "fileMatch": "renovate.yaml",
+      "fileMatch": "versions.yaml",
       "matchStrings": [
         "# renovate: datasource=(?<datasource>[^ ]+) depName=(?<depName>[^\\n]+)(?: versioning=(?<versioning>[^\\n]+))?\\n(?<depNameCapture>[^:]+): (?<currentValue>[^\\n]+)"
       ],

From e0eb684c21822a5cb88a11daca1c8539588f293a Mon Sep 17 00:00:00 2001
From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com>
Date: Wed, 28 Feb 2024 12:23:28 -0600
Subject: [PATCH 3/8] remove versioning specification in regex (#120)

[skip ci]
---
 versions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.yaml b/versions.yaml
index 65ecb37..1d8c94e 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -8,5 +8,5 @@ CODECOV_VER: 0.3.2
 YQ_VER: 4.41.1
 # renovate: datasource=github-releases depName=openucx/ucx
 UCX_VER: 1.14.1
-# renovate: datasource=docker depName=amazon/aws-cli versioning=docker
+# renovate: datasource=docker depName=amazon/aws-cli
 AWS_CLI_VER: 2.15.9

From 920eb7897a94957e5a11b94184471469df49ab75 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:23:44 -0500
Subject: [PATCH 4/8] Update mikefarah/yq Docker tag to v4.42.1 (#115)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 versions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.yaml b/versions.yaml
index 1d8c94e..106b6f6 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -5,7 +5,7 @@ GH_CLI_VER: 2.32.0
 # renovate: datasource=github-releases depName=codecov/uploader
 CODECOV_VER: 0.3.2
 # renovate: datasource=docker depName=mikefarah/yq
-YQ_VER: 4.41.1
+YQ_VER: 4.42.1
 # renovate: datasource=github-releases depName=openucx/ucx
 UCX_VER: 1.14.1
 # renovate: datasource=docker depName=amazon/aws-cli

From a1aa349086475bacda24abe54820631bbfad2816 Mon Sep 17 00:00:00 2001
From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:08:36 -0600
Subject: [PATCH 5/8] fix versioning capture (#123)

[skip ci]
---
 renovate.json | 2 +-
 versions.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/renovate.json b/renovate.json
index d399c67..d912893 100644
--- a/renovate.json
+++ b/renovate.json
@@ -7,7 +7,7 @@
     {
       "fileMatch": "versions.yaml",
       "matchStrings": [
-        "# renovate: datasource=(?<datasource>[^ ]+) depName=(?<depName>[^\\n]+)(?: versioning=(?<versioning>[^\\n]+))?\\n(?<depNameCapture>[^:]+): (?<currentValue>[^\\n]+)"
+        "# renovate: datasource=(?<datasource>[^ ]+) depName=(?<depName>[^\\s]+)(?:\\s+versioning=(?<versioning>[^\\n]+))?\\n(?<depNameCapture>[^:]+): (?<currentValue>[^\\n]+)"
       ],
       "depNameTemplate": "{{depName}}",
       "datasourceTemplate": "{{datasource}}",
diff --git a/versions.yaml b/versions.yaml
index 106b6f6..56b3d4a 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -4,9 +4,9 @@ SCCACHE_VER: 0.7.6
 GH_CLI_VER: 2.32.0
 # renovate: datasource=github-releases depName=codecov/uploader
 CODECOV_VER: 0.3.2
-# renovate: datasource=docker depName=mikefarah/yq
+# renovate: datasource=docker depName=mikefarah/yq versioning=docker
 YQ_VER: 4.42.1
 # renovate: datasource=github-releases depName=openucx/ucx
 UCX_VER: 1.14.1
-# renovate: datasource=docker depName=amazon/aws-cli
+# renovate: datasource=docker depName=amazon/aws-cli versioning=docker
 AWS_CLI_VER: 2.15.9

From 6cae9e7eea0887a7a1616260cb20001069d54c4a Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Fri, 1 Mar 2024 13:54:09 -0800
Subject: [PATCH 6/8] Use Python 3.11 in latest tag. (#125)

---
 latest.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/latest.yaml b/latest.yaml
index b8fb9f9..18c6b90 100644
--- a/latest.yaml
+++ b/latest.yaml
@@ -1,9 +1,9 @@
 # Define the values used for the "latest" tag
 conda:
   CUDA_VER: "12.0.1"
-  PYTHON_VER: "3.10"
+  PYTHON_VER: "3.11"
   LINUX_VER: "ubuntu22.04"
 wheels:
   CUDA_VER: "12.0.1"
-  PYTHON_VER: "3.10"
+  PYTHON_VER: "3.11"
   LINUX_VER: "ubuntu20.04"

From 50ea751fc692ff658ad9ccd3857221373994949f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:33:12 -0600
Subject: [PATCH 7/8] Update amazon/aws-cli Docker tag to v2.15.25 (#121)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 versions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.yaml b/versions.yaml
index 56b3d4a..070ab17 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -9,4 +9,4 @@ YQ_VER: 4.42.1
 # renovate: datasource=github-releases depName=openucx/ucx
 UCX_VER: 1.14.1
 # renovate: datasource=docker depName=amazon/aws-cli versioning=docker
-AWS_CLI_VER: 2.15.9
+AWS_CLI_VER: 2.15.25

From d1b5b7865351075b20f9882a5878e245b905c081 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:37:17 -0600
Subject: [PATCH 8/8] Update dependency cli/cli to v2.45.0 (#119)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 versions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.yaml b/versions.yaml
index 070ab17..6930d97 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -1,7 +1,7 @@
 # renovate: datasource=github-releases depName=mozilla/sccache
 SCCACHE_VER: 0.7.6
 # renovate: datasource=github-releases depName=cli/cli
-GH_CLI_VER: 2.32.0
+GH_CLI_VER: 2.45.0
 # renovate: datasource=github-releases depName=codecov/uploader
 CODECOV_VER: 0.3.2
 # renovate: datasource=docker depName=mikefarah/yq versioning=docker