updating docker-compose files to adhere new way to deploy

This commit is contained in:
biharck 2019-04-30 10:33:47 -03:00
parent e39e3dd5d5
commit f8e8acd9e9
3 changed files with 16 additions and 20 deletions

View File

@ -1,15 +1,14 @@
version: '3.5' version: '3.5'
services: services:
ldap: ldap:
image: dcm4che/slapd-dcm4chee:2.4.44-15.0 image: dcm4che/slapd-dcm4chee:2.4.44-15.0
logging: logging:
driver: json-file driver: json-file
options: options:
max-size: "10m" max-size: '10m'
ports: ports:
- "389:389" - '389:389'
env_file: ./dcm4che/docker-compose-dcm4che.env env_file: ./dcm4che/docker-compose-dcm4che.env
volumes: volumes:
- ./dcm4che/etc/localtime:/etc/localtime:ro - ./dcm4che/etc/localtime:/etc/localtime:ro
@ -23,9 +22,9 @@ services:
logging: logging:
driver: json-file driver: json-file
options: options:
max-size: "10m" max-size: '10m'
ports: ports:
- "5432:5432" - '5432:5432'
env_file: ./dcm4che/docker-compose-dcm4che.env env_file: ./dcm4che/docker-compose-dcm4che.env
volumes: volumes:
- ./dcm4che/etc/localtime:/etc/localtime:ro - ./dcm4che/etc/localtime:/etc/localtime:ro
@ -38,13 +37,13 @@ services:
logging: logging:
driver: json-file driver: json-file
options: options:
max-size: "10m" max-size: '10m'
ports: ports:
- "8080:8080" - '8080:8080'
- "8443:8443" - '8443:8443'
- "9990:9990" - '9990:9990'
- "11112:11112" - '11112:11112'
- "2575:2575" - '2575:2575'
env_file: ./dcm4che/docker-compose-dcm4che.env env_file: ./dcm4che/docker-compose-dcm4che.env
environment: environment:
WILDFLY_CHOWN: /opt/wildfly/standalone /storage WILDFLY_CHOWN: /opt/wildfly/standalone /storage
@ -70,9 +69,9 @@ services:
# - orthanc # - orthanc
environment: environment:
- NODE_ENV=production - NODE_ENV=production
- REACT_APP_CONFIG=config/local_dcm4chee
restart: always restart: always
networks: networks:
- dcm4che_default - dcm4che_default
networks: networks: dcm4che_default:
dcm4che_default:

View File

@ -1,15 +1,14 @@
version: '3.5' version: '3.5'
services: services:
orthanc: orthanc:
container_name: orthanc container_name: orthanc
image: jodogne/orthanc-plugins image: jodogne/orthanc-plugins
volumes: volumes:
- ../sampledata:/sampledata - ../sampledata:/sampledata
ports: ports:
- "4242:4242" - '4242:4242'
- "8042:8042" - '8042:8042'
restart: always restart: always
viewer: viewer:
container_name: ohif-viewer container_name: ohif-viewer
@ -22,6 +21,7 @@ services:
- orthanc - orthanc
environment: environment:
- NODE_ENV=production - NODE_ENV=production
- REACT_APP_CONFIG=config/local_orthanc
restart: always restart: always
volumes: volumes:
- ../config/local_orthanc.js:/usr/share/nginx/html/servers.js - ../config/local_orthanc.js:/usr/share/nginx/html/servers.js
@ -32,4 +32,3 @@ services:
- 8899:80 - 8899:80
volumes: volumes:
- ./nginx-proxy/conf/nginx.conf:/etc/nginx/nginx.conf:ro - ./nginx-proxy/conf/nginx.conf:/etc/nginx/nginx.conf:ro

View File

@ -1,7 +1,6 @@
version: '3.5' version: '3.5'
services: services:
viewer: viewer:
container_name: ohif-viewer container_name: ohif-viewer
build: build:
@ -11,5 +10,4 @@ services:
- '80:80' - '80:80'
environment: environment:
- NODE_ENV=production - NODE_ENV=production
volumes: - REACT_APP_CONFIG=config/public_dicomweb
- ../config/public_dicomweb.js:/usr/share/nginx/html/servers.js