Skip to content

Commit

Permalink
updated docker dev environment
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Hecher committed Feb 1, 2016
1 parent 73bc9ab commit 0c344c5
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 93 deletions.
86 changes: 0 additions & 86 deletions devenv-compose-build.yml

This file was deleted.

93 changes: 93 additions & 0 deletions docker-compose-dev.yml
@@ -0,0 +1,93 @@
duraark-sessions:
build: ./duraark-sessions
command: nodemon --watch /opt/duraark-sessions/api -w /opt/duraark-sessions/config /opt/duraark-sessions/app.js
volumes:
- /home/martin/01_work/duraark/duraark-storage:/duraark-storage
- ./duraark-sessions:/opt/duraark-sessions

duraark-metadata:
build: ./duraark-metadata
command: nodemon --watch /opt/duraark-metadata/src/api -w /opt/duraark-metadata/src/config /opt/duraark-metadata/src/app.js
volumes_from:
- duraark-sessions
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./duraark-metadata:/opt/duraark-metadata
environment:
# The outside storage path to an environment variable and link this folder into e.g. pc2bim at runtime
- DURAARK_STORAGE_PATH=/home/martin/01_work/duraark/duraark-storage

duraark-sda:
build: ./duraark-sda
command: nodemon --watch /opt/duraark-sda/api -w /opt/duraark-sda/config /opt/duraark-sda/app.js
volumes:
- ./duraark-sda:/opt/duraark-sda
links:
- duraark-sdas
environment:
# The outside storage path to an environment variable and link this folder into e.g. pc2bim at runtime
- DURAARK_STORAGE_PATH=/home/martin/01_work/duraark/duraark-storage

duraark-geometricenrichment:
build: ./duraark-geometricenrichment
command: nodemon --watch /opt/duraark-geometricenrichment/src/api -w /opt/duraark-geometricenrichment/src/config /opt/duraark-geometricenrichment/src/app.js
volumes_from:
- duraark-sessions
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./duraark-geometricenrichment:/opt/duraark-geometricenrichment
environment:
# The outside storage path to an environment variable and link this folder into e.g. pc2bim at runtime
- DURAARK_STORAGE_PATH=/home/martin/01_work/duraark/duraark-storage

duraark-digitalpreservation:
build: ./duraark-digitalpreservation
command: nodemon --watch /opt/duraark-digitalpreservation/api -w /opt/duraark-digitalpreservation/config -w /opt/duraark-digitalpreservation/bindings /opt/duraark-digitalpreservation/app.js
volumes_from:
- duraark-sessions
links:
- duraark-metadata
volumes:
- ./duraark-digitalpreservation:/opt/duraark-digitalpreservation
- /home/hecher/.ssh:/home/hecher/.ssh

duraark-sdas:
image: eccenca/virtuoso7
ports:
- 8890:8890
- 1111:1111
volumes:
- ../virtuoso/db:/var/lib/virtuoso/db

duraark-pointcloud-viewer:
build: duraark-pointcloud-viewer
ports:
- "5016:5016"
volumes_from:
- duraark-sessions
volumes:
- /var/run/docker.sock:/var/run/docker.sock

workbench-ui:
build: ./workbench-ui
entrypoint: ember
command: serve --watcher=polling
ports:
- "35729:35729"
volumes:
- ./workbench-ui:/opt/workbench-ui
environment:
- DURAARK_API_ENDPOINT=http://localhost

web:
build: ./api-gatekeeper
ports:
- "80:80"
links:
- duraark-sessions
- duraark-metadata
- duraark-sda
- duraark-geometricenrichment
- duraark-digitalpreservation
- duraark-pointcloud-viewer
- workbench-ui
2 changes: 1 addition & 1 deletion duraark-digitalpreservation
2 changes: 1 addition & 1 deletion duraark-sessions
2 changes: 1 addition & 1 deletion microservice-base
Submodule microservice-base updated 1 files
+8 −2 Dockerfile
4 changes: 2 additions & 2 deletions scripts/deploy-from-local-builds.sh
Expand Up @@ -6,5 +6,5 @@ git pull && git submodule foreach git checkout master && git submodule foreach g
echo "(cd ./microservice-base && ./scripts/docker-build.sh)"
(cd ./microservice-base && ./scripts/docker-build.sh)

echo "docker-compose -f devenv-compose-build.yml build && docker-compose -f devenv-compose-build.yml up"
docker-compose -f devenv-compose-build.yml build && docker-compose -f devenv-compose-build.yml up -d
echo "docker-compose -f docker-compose-prod.yml build && docker-compose -f docker-compose-prod.yml up"
docker-compose -f docker-compose-prod.yml build && docker-compose -f docker-compose-prod.yml up -d

0 comments on commit 0c344c5

Please sign in to comment.