Skip to content

Commit

Permalink
Merge pull request #19128 from bernt-matthias/topic/miniforge-docker
Browse files Browse the repository at this point in the history
Also use miniforge docker for container building
  • Loading branch information
jdavcs authored Nov 12, 2024
2 parents 2106c58 + bfd895a commit f2fe4c5
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions lib/galaxy/tool_util/deps/mulled/mulled_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
IS_OS_X = _platform == "darwin"
INVOLUCRO_VERSION = "1.1.2"
DEST_BASE_IMAGE = os.environ.get("DEST_BASE_IMAGE", None)
CONDA_IMAGE = os.environ.get("CONDA_IMAGE", None)
CONDA_IMAGE = os.environ.get("CONDA_IMAGE", "quay.io/condaforge/miniforge3:latest")

SINGULARITY_TEMPLATE = """Bootstrap: docker
From: %(base_image)s
Expand Down Expand Up @@ -374,13 +374,12 @@ def __init__(
condarc_override=None,
):
if not conda_exec:
conda_image = CONDA_IMAGE or "continuumio/miniconda3:latest"
binds = []
for channel in ensure_channels:
if channel.startswith("file://"):
bind_path = channel[7:]
binds.extend(["-v", f"{bind_path}:{bind_path}"])
conda_exec = docker_command_list("run", binds + [conda_image, "conda"])
conda_exec = docker_command_list("run", binds + [CONDA_IMAGE, "conda"])
super().__init__(
conda_prefix=conda_prefix,
conda_exec=conda_exec,
Expand Down

0 comments on commit f2fe4c5

Please sign in to comment.