Use galaxy-manage. Adds test-data.

INSTALL.md

@@ -22,6 +22,7 @@ This document provides a guide for installing Galaxy.
   - [Post build](#post-build)
   - [Accessing Galaxy](#accessing-galaxy)
   - [Configure GitHub Oauth](#configure-github-oauth)
+  - [Load platforms](#load-platforms)
   - [Stop containers](#stop-containers)
 
 ## Getting started
@@ -284,7 +285,7 @@ In order to access Galaxy using GitHub Oauth, you'll need to complete create an
 You'll first need to create an admin user by performing the following:
 
 - Start an interactive sessoin on the web container by running the command: `docker exec -it galaxy_web_1 /bin/bash`
-- Within the web container run the following: `${VENV_BIN}/python manage.py createsuperuser`
+- Within the web container run the following: `${VENV_BIN}/galaxy-manage createsuperuser`
 - You will be prompted for a username, email address and password, and asked to confirm the password. The email address is not important, any value that looks like a valid email will work. 
 - Once the account is created, use the `exit` command to termintate the session. 
 
@@ -308,6 +309,21 @@ Within the new social application, set the `Provider` to `GitHub`, and the `Name
 
 Log out of your admin account on your Galaxy site, return to the [home page](http://localhost), and click the Octocat logo to log in using your GitHub account.
 
+### Load platforms
+
+If you want to poplulate the Platforms data, run the following:
+
+```bash
+# Start an interactive session with the web container
+$ docker exec -it galaxy_web_1 /bin/bash 
+
+# Set the working directory
+$ cd /galaxy/test-data
+
+# Load platforms
+$ ${VENV_BIN}/galaxy-manage loaddata platform.json
+```
+
 ### Stop containers
 
 To stop the Galaxy containers, run the following:

scripts/compose.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
   web:
     image: galaxy:latest
-    command: ['/bin/bash', '-c', '/entrypoint.sh manage waitenv && /entrypoint.sh manage migrate --noinput && /entrypoint.sh run web']
+    command: ['/bin/bash', '-c', '/entrypoint.sh manage waitenv && /entrypoint.sh manage migrate --noinput && /entrypoint.sh manage rebuild_index --noinput && /entrypoint.sh manage rebuild_galaxy_indexes && /entrypoint.sh run web']
     environment:
       - GALAXY_SECRET_KEY=secret
       - GALAXY_DB_HOST=postgres
@@ -22,7 +22,7 @@ services:
 
   worker:
     image: galaxy:latest
-    command: ['/bin/bash', '-c', '/entrypoint.sh manage waitenv && /entrypoint.sh run worker']
+    command: ['/bin/bash', '-c', '/entrypoint.sh manage waitenv --wait-for web:8000 && /entrypoint.sh run worker']
     environment:
       - GALAXY_SECRET_KEY=secret
       - GALAXY_DB_HOST=postgres

scripts/docker-release/Dockerfile

@@ -41,6 +41,10 @@ COPY build/static /var/lib/galaxy/public/static
 RUN ${VENV_BIN}/pip install $(readlink -f /tmp/dist/galaxy.whl) \
     && rm -rf /tmp/dist
 
+# Copy test data
+RUN mkdir -p /galaxy/test-data
+COPY test-data/* /galaxy/test-data/
+
 WORKDIR /galaxy
 
 ENV DJANGO_SETTINGS_MODULE galaxy.settings.production

scripts/docker-release/entrypoint.sh

@@ -20,8 +20,8 @@ function run_web() {
 }
 
 function run_worker() {
-    _exec_cmd "${VENV_BIN}/python" manage.py celeryd \
-        -B --autoreload -Q 'celery,import_tasks,login_tasks'
+    _exec_cmd "${VENV_BIN}/galaxy-manage" celeryd \
+        -B --autoreload -Q 'celery,import_tasks,login_tasks,admin_tasks,user_tasks,star_tasks'
 }
 
 function run_service() {
@@ -40,7 +40,7 @@ case "$1" in
         run_service "${@:2}"
     ;;
     manage)
-        _exec_cmd "${VENV_BIN}/python" manage.py "${@:2}"
+        _exec_cmd "${VENV_BIN}/galaxy-manage" "${@:2}"
     ;;
 esac