refactor docker compse names

This commit is contained in:
Terry Brady
2019-09-30 10:45:45 -07:00
parent eca35851d3
commit c6d2cb66c7
8 changed files with 55 additions and 5 deletions

View File

@@ -20,9 +20,9 @@ before_install:
install: install:
# Start up DSpace 7 using the entities database dump # Start up DSpace 7 using the entities database dump
- docker-compose -f docker-compose-travis.yml up -d - docker-compose -f ./docker/docker-compose-travis.yml up -d
# Use the dspace-cli image to populate the assetstore. Trigger a discovery and oai update # Use the dspace-cli image to populate the assetstore. Trigger a discovery and oai update
- docker-compose -f ./to_be_determined/cli.yml -f ./to_be_determined/cli.assetstore.yml run --rm dspace-cli - docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli
- travis_retry yarn install - travis_retry yarn install
before_script: before_script:
@@ -31,7 +31,7 @@ before_script:
#- curl http://localhost:8080/ #- curl http://localhost:8080/
after_script: after_script:
- docker-compose -f docker-compose-travis.yml down - docker-compose -f ./docker/docker-compose-travis.yml down
addons: addons:
apt: apt:

View File

@@ -27,4 +27,4 @@ services:
stdin_open: true stdin_open: true
tty: true tty: true
volumes: volumes:
- ./to_be_determined/environment.dev.js:/app/config/environment.dev.js - ./docker/environment.dev.js:/app/config/environment.dev.js

View File

@@ -0,0 +1,50 @@
networks:
dspacenet: {}
services:
dspace:
container_name: dspace
depends_on:
- dspacedb
image: dspace/dspace:dspace-7_x-jdk8-test
networks:
dspacenet: {}
ports:
- published: 8080
target: 8080
stdin_open: true
tty: true
volumes:
- assetstore:/dspace/assetstore
- ./local.cfg:/dspace/config/local.cfg
dspacedb:
container_name: dspacedb
image: dspace/dspace-postgres-pgcrypto
networks:
dspacenet: {}
stdin_open: true
tty: true
volumes:
- pgdata:/pgdata
dspacesolr:
container_name: dspacesolr
image: dspace/dspace-solr
networks:
dspacenet: {}
ports:
- published: 8983
target: 8983
stdin_open: true
tty: true
volumes:
- solr_authority:/opt/solr/server/solr/authority/data
- solr_oai:/opt/solr/server/solr/oai/data
- solr_search:/opt/solr/server/solr/search/data
- solr_statistics:/opt/solr/server/solr/statistics/data
version: '3.7'
volumes:
assetstore: {}
pgdata: {}
solr_authority: {}
solr_oai: {}
solr_search: {}
solr_statistics: {}

View File

@@ -15,7 +15,7 @@ services:
tty: true tty: true
volumes: volumes:
- assetstore:/dspace/assetstore - assetstore:/dspace/assetstore
- ./to_be_determined/local.cfg:/dspace/config/local.cfg - ./local.cfg:/dspace/config/local.cfg
dspacedb: dspacedb:
container_name: dspacedb container_name: dspacedb
environment: environment: