From 08f966b0b89f52313e56ea3bbe344e2687540653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Tue, 30 May 2017 16:15:13 +0200 Subject: [PATCH] conda fix --- galaxy/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/galaxy/Dockerfile b/galaxy/Dockerfile index 0e48e3fd3..9dd5d16f1 100644 --- a/galaxy/Dockerfile +++ b/galaxy/Dockerfile @@ -182,6 +182,11 @@ GALAXY_CONDA_PREFIX=$GALAXY_CONFIG_TOOL_DEPENDENCY_DIR/_conda ADD GalaxyDocker.png $GALAXY_CONFIG_DIR/web/welcome_image.png ADD welcome.html $GALAXY_CONFIG_DIR/web/welcome.html +RUN ./scripts/common_startup.sh && \ + # Install all required Node dependencies. This is required to get proxy support to work for Interactive Environments + cd $GALAXY_ROOT/lib/galaxy/web/proxy/js && \ + npm install + # Switch back to User root USER root @@ -196,14 +201,11 @@ ADD ./setup_postgresql.py /usr/local/bin/setup_postgresql.py RUN rm $PG_DATA_DIR_DEFAULT -rf && \ python /usr/local/bin/setup_postgresql.py --dbuser galaxy --dbpassword galaxy --db-name galaxy --dbpath $PG_DATA_DIR_DEFAULT && \ service postgresql start && \ - bash ./scripts/common_startup.sh && \ . $GALAXY_VIRTUAL_ENV/bin/activate && \ - sh create_db.sh -c "$GALAXY_CONFIG_FILE" && \ python ./scripts/manage_tool_dependencies.py -c "$GALAXY_CONFIG_FILE" init_if_needed && \ + sh create_db.sh -c "$GALAXY_CONFIG_FILE" && \ python /usr/local/bin/create_galaxy_user.py --user $GALAXY_DEFAULT_ADMIN_USER --password $GALAXY_DEFAULT_ADMIN_PASSWORD -c $GALAXY_CONFIG_FILE --key $GALAXY_DEFAULT_ADMIN_KEY && \ - service postgresql stop && \ - cd $GALAXY_ROOT/lib/galaxy/web/proxy/js && \ - npm install + service postgresql stop # Activate additional Tool Sheds # Activate the Test Tool Shed during runtime, useful for testing repositories.