rename file and add conda-forge channel to .condarc

repo2docker/buildpacks/conda/__init__.py

@@ -98,7 +98,7 @@ class CondaBuildPack(BaseImage):
 
         All scripts here should be independent of contents of the repository.
 
-        This sets up through `install-micromamba.bash` (found in this directory):
+        This sets up through `install-base-env.bash` (found in this directory):
 
         - a directory for the conda environment and its ownership by the
           notebook user
@@ -115,8 +115,8 @@ class CondaBuildPack(BaseImage):
                 "root",
                 r"""
                 TIMEFORMAT='time: %3R' \
-                bash -c 'time /tmp/install-micromamba.bash' && \
-                rm /tmp/install-micromamba.bash /tmp/environment.yml
+                bash -c 'time /tmp/install-base-env.bash' && \
+                rm /tmp/install-base-env.bash /tmp/environment.yml
                 """,
             ),
             (
@@ -146,7 +146,7 @@ class CondaBuildPack(BaseImage):
 
         """
         files = {
-            "conda/install-micromamba.bash": "/tmp/install-micromamba.bash",
+            "conda/install-base-env.bash": "/tmp/install-base-env.bash",
             "conda/activate-conda.sh": "/etc/profile.d/activate-conda.sh",
         }
         py_version = self.python_version
@@ -337,7 +337,7 @@ class CondaBuildPack(BaseImage):
                     "${NB_USER}",
                     r"""
                 TIMEFORMAT='time: %3R' \
-                bash -c 'time /tmp/bin/micromamba install -p {0} -f "{1}" -c conda-forge && \
+                bash -c 'time /tmp/bin/micromamba install -p {0} -f "{1}" && \
                 # time /tmp/bin/micromamba clean --all -y && \
                 /tmp/bin/micromamba list -p {0} \
                 '
@@ -356,7 +356,7 @@ class CondaBuildPack(BaseImage):
                 (
                     "${NB_USER}",
                     r"""
-                /tmp/bin/micromamba install -p {0} r-base{1} r-irkernel={2} r-devtools -y -c conda-forge && \
+                /tmp/bin/micromamba install -p {0} r-base{1} r-irkernel={2} r-devtools -y && \
                 #  /tmp/bin/micromamba clean --all -f -y && \
                 /tmp/bin/micromamba list -p {0}
                 """.format(

repo2docker/buildpacks/conda/install-base-env.bash

@@ -28,6 +28,7 @@ export PATH="${PWD}/bin:$PATH"
 
 cat <<EOT >> ${CONDA_DIR}/.condarc
 channels:
+  - conda-forge
   - defaults
 auto_update_conda: false
 show_channel_urls: true

tests/conda/binder-dir/verify

@@ -5,6 +5,6 @@ from subprocess import check_output
 assert sys.version_info[:2] == (3, 5), sys.version
 
 out = check_output(["/tmp/bin/micromamba", "--version"]).decode("utf8").strip()
-assert out == "0.12.2", out
+assert out == "0.13.0", out
 
 import numpy