Skip to content

Commit

Permalink
fix error when building images where conda channels is passed as a st…
Browse files Browse the repository at this point in the history
…ring instead of a list
  • Loading branch information
scholtalbers committed Nov 22, 2018
1 parent 8470e91 commit 7474eea
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/galaxy/tools/deps/mulled/mulled_build.py
Expand Up @@ -39,7 +39,7 @@
from ..conda_compat import MetaData

DIRNAME = os.path.dirname(__file__)
DEFAULT_CHANNELS = "conda-forge,bioconda"
DEFAULT_CHANNELS = ["conda-forge", "bioconda"]
DEFAULT_REPOSITORY_TEMPLATE = "quay.io/${namespace}/${image}"
DEFAULT_BINDS = ["build/dist:/usr/local/"]
DEFAULT_WORKING_DIR = '/source/'
Expand Down Expand Up @@ -322,7 +322,7 @@ def add_build_arguments(parser):
help='quay.io namespace.')
parser.add_argument('-r', '--repository_template', dest='repository_template', default=DEFAULT_REPOSITORY_TEMPLATE,
help='Docker repository target for publication (only quay.io or compat. API is currently supported).')
parser.add_argument('-c', '--channels', dest='channels', default=DEFAULT_CHANNELS,
parser.add_argument('-c', '--channels', dest='channels', default=",".join(DEFAULT_CHANNELS),
help='Comma separated list of target conda channels.')
parser.add_argument('--conda-version', dest="conda_version", default=None,
help="Change to specified version of Conda before installing packages.")
Expand Down

0 comments on commit 7474eea

Please sign in to comment.