Merge branch 'main' into git-sync-fix

spacetelescope · Oct 2, 2024 · a0154a5 · a0154a5
2 parents 614d5a5 + 189eeef
commit a0154a5
Show file tree

Hide file tree

Showing 7 changed files with 214 additions and 235 deletions.
diff --git a/deployments/common/Dockerfile b/deployments/common/Dockerfile
@@ -29,7 +29,7 @@ ARG PIP_SWITCHES=""
 ENV PIP_SWITCHES=$PIP_SWITCHES
 
 # Enable easy swap of conda with e.g. mamba
-ARG CONDA_VER=conda
+ARG CONDA_VER=mamba
 ENV CONDA_VER=${CONDA_VER}
 
 ARG USER_CACHE_DIRS=""