Forward-merge branch-23.08 into branch-23.10

.github/actions/build-image/action.yml

@@ -47,5 +47,5 @@ runs:
           --cache-from "${repo}:${{ inputs.tag }}" \
           --image-name "${repo}:${{ inputs.tag }}" \
           --workspace-folder "$(realpath -m ./image)" \
-          --output "type=oci,dest=${{ runner.temp }}/${{ inputs.arch }}.tar" \
+          --output "type=docker,dest=${{ runner.temp }}/${{ inputs.arch }}.tar" \
           ;

.github/workflows/build-and-push-image.yml

@@ -95,14 +95,12 @@ jobs:
           hashes=();
 
           for arch in "amd64" "arm64"; do
-            # Load and push the linux/$arch image and read its local hash
-            hash="$(docker load --input "${{ runner.temp }}/${arch}.tar" | tail -n1 | cut -d':' -f3)";
-            # Tag the loaded image with the final name
-            docker image tag ${hash} ${name};
-            # Push the local image to the registry to get its remote hash
-            hash="$(docker push ${name} | tail -n1 | cut -d' ' -f3)";
-            # Save the remote hash for use below
-            hashes+=("$hash");
+            # Load the linux/$arch and tag the loaded image with the final name
+            docker image tag \
+              $(docker load --input "${{ runner.temp }}/${arch}.tar" | tail -n1 | cut -d' ' -f3) \
+              ${name};
+            # Push the local image to the registry to get its remote hash and save the remote hash for use below
+            hashes+=("$(docker push ${name} | tail -n1 | cut -d' ' -f3)");
           done
 
           # Create and push the multiarch manifest

features/src/rapids-build-utils/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "23.8.13",
+  "version": "23.8.14",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

features/src/rapids-build-utils/install.sh

@@ -24,7 +24,7 @@ fi
 
 # Install the rapids dependency file generator and conda-merge
 if type python >/dev/null 2>&1; then
-    python -m pip install rapids-dependency-file-generator conda-merge toml;
+    python -m pip install 'rapids-dependency-file-generator<1.14' conda-merge toml;
 fi
 
 # Install RAPIDS build utility scripts to /opt/

features/src/utils/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "23.8.12",
+  "version": "23.8.13",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

features/src/utils/opt/devcontainer/bin/vault/auth/github.sh

@@ -8,19 +8,24 @@ get_vault_token() {
     local VAULT_HOST="$1";
     local user_orgs="${@:2}";
     local gh_token="$(gh auth token)";
-    local org
 
     local vault_token=null;
+    local org;
 
     for org in ${user_orgs}; do
-        vault_token="$(                                   \
-            curl -s                                       \
-                -X POST                                   \
-                -H "Content-Type: application/json"       \
-                -d "{\"token\": \"$gh_token\"}"           \
-                "$VAULT_HOST/v1/auth/github-${org}/login" \
-          | jq -r '.auth.client_token'                    \
-        )";
+        for org in $(echo -e "${org}\n${org,,}\n${org^^}" | sort -su); do
+            vault_token="$(                                   \
+                curl -s                                       \
+                    -X POST                                   \
+                    -H "Content-Type: application/json"       \
+                    -d "{\"token\": \"$gh_token\"}"           \
+                    "$VAULT_HOST/v1/auth/github-${org}/login" \
+              | jq -r '.auth.client_token'                    \
+            )";
+            if [[ "${vault_token:-null}" != null ]]; then
+                break;
+            fi
+        done
         if [[ "${vault_token:-null}" != null ]]; then
             break;
         fi
@@ -29,4 +34,8 @@ get_vault_token() {
     echo "vault_token='$vault_token'";
 }
 
+if test -n "${devcontainer_utils_debug:-}"; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
 (get_vault_token "$@");

features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh

@@ -37,7 +37,7 @@ generate_s3_creds() {
     local user_orgs="$(                              \
         gh api user/orgs --jq '.[].login'            \
             -H "Accept: application/vnd.github+json" \
-        | grep --color=never -E "(${allowed_orgs})"  \
+        | grep --color=never -iE "(${allowed_orgs})" \
     )";
 
     if test -z "${user_orgs:-}"; then