opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tool shed pre-population against current dev.

Browse Source 
I don't know how this ever worked to be honest - but these changes make a lot of sense. I think there was another bug somewhere that prevented this bug from exhibiting itself.
This commit is contained in:
John Chilton
2017-01-05 14:52:06 -05:00
parent c9a876e659
commit a78ae1bb71
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/docker/base/Dockerfile
+3 -5
View File
@@ -85,13 +85,11 @@ RUN . $GALAXY_VIRTUAL_ENV/bin/activate && \
echo "Prepopulating mysql database" && \
GALAXY_CONFIG_DATABASE_CONNECTION="mysql://galaxy:galaxy@localhost/galaxy?unix_socket=/var/run/mysqld/mysqld.sock" bash create_db.sh && \
echo "Prepopulating toolshed postgres database" && \
su -c '/usr/lib/postgresql/9.3/bin/pg_ctl -o "-F" start -D /opt/galaxy/db' postgres && \
GALAXY_CONFIG_DATABASE_CONNECTION="postgresql://root@localhost:5930/toolshed" bash create_db.sh tool_shed && \
TOOL_SHED_CONFIG_DATABASE_CONNECTION="postgresql://root@localhost:5930/toolshed" bash create_db.sh tool_shed && \
echo "Prepopulating toolshed sqlite database" && \
GALAXY_CONFIG_DATABASE_CONNECTION="sqlite:////opt/galaxy/toolshed.sqlite" bash create_db.sh tool_shed && \
sh /opt/galaxy/start_mysql.sh && \
TOOL_SHED_CONFIG_DATABASE_CONNECTION="sqlite:////opt/galaxy/toolshed.sqlite" bash create_db.sh tool_shed && \
echo "Prepopulating toolshed mysql database" && \
GALAXY_CONFIG_DATABASE_CONNECTION="mysql://galaxy:galaxy@localhost/toolshed?unix_socket=/var/run/mysqld/mysqld.sock" bash create_db.sh tool_shed
TOOL_SHED_CONFIG_DATABASE_CONNECTION="mysql://galaxy:galaxy@localhost/toolshed?unix_socket=/var/run/mysqld/mysqld.sock" bash create_db.sh tool_shed
# bcftools for Galaxy.
RUN mkdir -p /tmp/install && \
test/docker/base/run_test_wrapper.sh
+2
View File
@@ -31,6 +31,8 @@ export GALAXY_TEST_INSTALL_DB_MERGED
cd /galaxy
GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION="$GALAXY_TEST_DBURI";
export GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION
TOOL_SHED_CONFIG_OVERRIDE_DATABASE_CONNECTION="$TOOL_SHED_TEST_DBURI";
export TOOL_SHED_CONFIG_OVERRIDE_DATABASE_CONNECTION
: ${GALAXY_VIRTUAL_ENV:=.venv}