From 4dd9bd5f145fbe8a5d0ff383282ae75b8c57e44b Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:24:43 -0800
Subject: [PATCH 1/2] Fix mambaforge shell history (#219)

* disable history when restoring shell options

* Update devcontainer-feature.json
---
 features/src/mambaforge/.bashrc                   | 6 +++---
 features/src/mambaforge/devcontainer-feature.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/src/mambaforge/.bashrc b/features/src/mambaforge/.bashrc
index 7ef4b92be..c6804046a 100644
--- a/features/src/mambaforge/.bashrc
+++ b/features/src/mambaforge/.bashrc
@@ -6,12 +6,12 @@ for default_conda_env_name in ${DEFAULT_CONDA_ENV:-} ${CONDA_DEFAULT_ENV:-} base
         break;
     fi
     # Temporarily allow unbound variables for conda activation.
-    oldstate="$(shopt -po; shopt -p)"; [[ -o errexit ]] && oldstate="${oldstate}; set -e"; set +u;
+    oldstate="$(shopt -po | grep -E '(nounset|verbose|xtrace)')"; set +u;
     if conda activate "${default_conda_env_name}" 2>/dev/null; then
-        { set +vx; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
+        { set +vxo history; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
         break;
     else
-        { set +vx; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
+        { set +vxo history; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
         continue;
     fi
 done
diff --git a/features/src/mambaforge/devcontainer-feature.json b/features/src/mambaforge/devcontainer-feature.json
index d35147a02..4bcff969c 100644
--- a/features/src/mambaforge/devcontainer-feature.json
+++ b/features/src/mambaforge/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Mambaforge",
   "id": "mambaforge",
-  "version": "24.2.2",
+  "version": "24.2.3",
   "description": "A feature to install mambaforge",
   "options": {
     "version": {

From 2b31417b385d35168b84ae3d5fbffa0dcbb425f5 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 4 Feb 2024 22:36:27 -0800
Subject: [PATCH 2/2] login to dockerhub so we don't hit rate limits

---
 .github/workflows/build-and-test-feature.yml        |  6 ++++++
 .../workflows/build-test-and-push-linux-image.yml   |  6 ++++++
 .../workflows/build-test-and-push-windows-image.yml | 13 ++++++-------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-test-feature.yml b/.github/workflows/build-and-test-feature.yml
index fcca147d8..e94ae0896 100644
--- a/.github/workflows/build-and-test-feature.yml
+++ b/.github/workflows/build-and-test-feature.yml
@@ -25,6 +25,12 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
+          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
+
       - name: ${{ inputs.name }}
         uses: ./.github/actions/build-and-test-feature
         with:
diff --git a/.github/workflows/build-test-and-push-linux-image.yml b/.github/workflows/build-test-and-push-linux-image.yml
index ad4ae47d9..2b267a00e 100644
--- a/.github/workflows/build-test-and-push-linux-image.yml
+++ b/.github/workflows/build-test-and-push-linux-image.yml
@@ -51,6 +51,12 @@ jobs:
           features: "${{ inputs.features }}"
           container_env: "${{ inputs.container_env }}"
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
+          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
+
       - name: Build ${{ steps.json.outputs.tag }}-${{ matrix.arch }}
         uses: ./.github/actions/build-linux-image
         with:
diff --git a/.github/workflows/build-test-and-push-windows-image.yml b/.github/workflows/build-test-and-push-windows-image.yml
index 35eacdbe9..69a9d4f57 100644
--- a/.github/workflows/build-test-and-push-windows-image.yml
+++ b/.github/workflows/build-test-and-push-windows-image.yml
@@ -59,6 +59,12 @@ jobs:
           tag=${version}-cuda${cuda}-cl${cl}-${{ inputs.os }}${{ matrix.edition }}
           EOF
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
+          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
+
       - name: Build ${{ steps.info.outputs.tag }}
         uses: ./.github/actions/build-windows-image
         with:
@@ -79,13 +85,6 @@ jobs:
           version: "${{ steps.info.outputs.version }}"
           edition: "${{ matrix.edition }}"
 
-      - if: inputs.push == 'true'
-        name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
-          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
-
       - if: inputs.push == 'true'
         name: Push ${{ steps.info.outputs.tag }}
         shell: powershell