Unverified Commit 7e70b115 authored by Björn Grüning's avatar Björn Grüning Committed by GitHub
Browse files

Merge pull request #11966 from mvdbeek/update_base_images 

[21.01] Update default base images, make DEFAULT_CHANNELS configurable via env var
parents e3a29d67 d6992b2b

lib/galaxy/tool_util/deps/mulled/invfile.lua

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ end 


local destination_base_image = VAR.DEST_BASE_IMAGE

if destination_base_image == '' then

    destination_base_image = 'bgruening/busybox-bash:0.1'

    destination_base_image = 'quay.io/bioconda/base-glibc-busybox-bash:latest'

end



local verbose = VAR.VERBOSE

lib/galaxy/tool_util/deps/mulled/mulled_build.py

+6 −3
Original line number Diff line number Diff line
@@ -46,8 +46,11 @@ from ..conda_compat import MetaData 
log = logging.getLogger(__name__)



DIRNAME = os.path.dirname(__file__)

DEFAULT_BASE_IMAGE = "bgruening/busybox-bash:0.1"

DEFAULT_EXTENDED_BASE_IMAGE = "bioconda/extended-base-image:latest"

DEFAULT_BASE_IMAGE = os.environ.get("DEFAULT_BASE_IMAGE", "quay.io/bioconda/base-glibc-busybox-bash:latest")

DEFAULT_EXTENDED_BASE_IMAGE = os.environ.get("DEFAULT_EXTENDED_BASE_IMAGE", "quay.io/bioconda/base-glibc-debian-bash:latest")

if 'DEFAULT_MULLED_CONDA_CHANNELS' in os.environ:

    DEFAULT_CHANNELS = os.environ['DEFAULT_MULLED_CONDA_CHANNELS'].split(',')

else:

    DEFAULT_CHANNELS = ["conda-forge", "bioconda"]

DEFAULT_REPOSITORY_TEMPLATE = "quay.io/${namespace}/${image}"

DEFAULT_BINDS = ["build/dist:/usr/local/"]