Merge pull request #479 from terrywbrady/compose-v2

Use the improved DSpace Docker Compose files to create the ci image
This commit is contained in:
Tim Donohue
2019-09-16 19:06:52 +02:00
committed by GitHub

View File

@@ -20,8 +20,10 @@ before_install:
- git clone https://github.com/DSpace-Labs/DSpace-Docker-Images.git - git clone https://github.com/DSpace-Labs/DSpace-Docker-Images.git
install: install:
- docker-compose version # Start up DSpace 7 using the entities database dump
- docker-compose -f DSpace-Docker-Images/docker-compose-files/dspace-compose/d7.travis.yml up -d - docker-compose -f DSpace-Docker-Images/docker-compose-files/dspace-compose-v2/d7.travis.ci.yml up -d
# Use the dspace-cli image to populate the assetstore. Trigger a discovery and oai update
- docker-compose -f DSpace-Docker-Images/docker-compose-files/dspace-compose-v2/d7.cli.yml -f DSpace-Docker-Images/docker-compose-files/dspace-compose-v2/d7.cli.assetstore.yml run --rm dspace-cli
- travis_retry yarn install - travis_retry yarn install
before_script: before_script:
@@ -30,7 +32,7 @@ before_script:
#- curl http://localhost:8080/ #- curl http://localhost:8080/
after_script: after_script:
- docker-compose -f DSpace-Docker-Images/docker-compose-files/dspace-compose/d7.travis.yml down - docker-compose -f DSpace-Docker-Images/docker-compose-files/dspace-compose-v2/d7.travis.ci.yml down
addons: addons:
apt: apt: