Skip to content

Commit

Permalink
make internal volume mount relevant (#28)
Browse files Browse the repository at this point in the history
* make internal volume mount relevant

* attemping again

* fixed test
  • Loading branch information
nathandunn authored May 12, 2020
1 parent 1aaad04 commit ace080b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions bootstrap_apollo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export GALAXY_SHARED_DIR=`pwd`/apollo_shared_dir
mkdir -p "$GALAXY_SHARED_DIR"

if ! [[ $SHOULD_LAUNCH_DOCKER -eq 0 ]]; then
docker run --memory=4g -d -p 8888:8080 -v `pwd`/apollo_shared_dir/:`pwd`/apollo_shared_dir/ -e "WEBAPOLLO_DEBUG=true" quay.io/gmod/apollo:latest
docker run --memory=4g -d -p 8888:8080 -v `pwd`/apollo_shared_dir/:/data/ -e "WEBAPOLLO_DEBUG=true" quay.io/gmod/apollo:latest
fi

echo "[BOOTSTRAP] Waiting while Apollo starts up..."
Expand Down Expand Up @@ -54,10 +54,10 @@ cp -r test-data/dataset_1_files/data/ "${GALAXY_SHARED_DIR}/org3"
cp -r test-data/dataset_1_files/data/ "${GALAXY_SHARED_DIR}/org4"
cp -r test-data/dataset_2_files/data/ "${GALAXY_SHARED_DIR}/org_update_newseq"
cp -r test-data/dataset_3_files/data/ "${GALAXY_SHARED_DIR}/org_update_changedseq"
arrow organisms add_organism --genus Testus --species organus test_organism $GALAXY_SHARED_DIR/org1
arrow organisms add_organism --genus Foo --species barus alt_org $GALAXY_SHARED_DIR/org2
arrow organisms add_organism --genus Foo3 --species barus org3 $GALAXY_SHARED_DIR/org3
arrow organisms add_organism --genus Foo4 --species barus org4 $GALAXY_SHARED_DIR/org4
arrow organisms add_organism --genus Testus --species organus test_organism /data/org1
arrow organisms add_organism --genus Foo --species barus alt_org /data/org2
arrow organisms add_organism --genus Foo3 --species barus org3 /data/org3
arrow organisms add_organism --genus Foo4 --species barus org4 /data/org4

# Give access to organisms for test user
arrow users update_organism_permissions --write --read --export "[email protected]" test_organism
Expand Down
2 changes: 1 addition & 1 deletion test/organism_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def test_get_organisms(self):
assert 'species' in first_org
assert 'metadata' in first_org

assert 'apollo_shared_dir/org' in first_org['directory']
assert '/data/org' in first_org['directory']
assert first_org['commonName'] in ['test_organism', 'alt_org', 'org3', 'org4']

def test_get_organism_creator(self):
Expand Down

0 comments on commit ace080b

Please sign in to comment.