Compare commits
No commits in common. "0f2482d1c91e90b9460801891efc303bbb64c828" and "1fabada0ab240f4ebc4c0f10ba39bacc5afd81a0" have entirely different histories.
0f2482d1c9
...
1fabada0ab
@ -163,7 +163,7 @@
|
|||||||
"LoadPrivateDictionary": true,
|
"LoadPrivateDictionary": true,
|
||||||
"Dictionary" : {
|
"Dictionary" : {
|
||||||
"0011,1060" : [ "LO", "InnowaveUploaderID", 1, 1, "InowavePrivateGroup"],
|
"0011,1060" : [ "LO", "InnowaveUploaderID", 1, 1, "InowavePrivateGroup"],
|
||||||
"1971,0010" : [ "CS", "PBSender", 1, 1, "PixelBridge"],
|
"1971,0010" : [ "CS", "PBSender", 1, 1, "PixelBridge"]
|
||||||
"1971,1001" : [ "LO", "DicomSenderID", 1, 1, "PixelBridge"]
|
"1971,1001" : [ "LO", "DicomSenderID", 1, 1, "PixelBridge"]
|
||||||
},
|
},
|
||||||
"SynchronousCMove": true,
|
"SynchronousCMove": true,
|
||||||
|
@ -19,7 +19,7 @@ services:
|
|||||||
- postgres
|
- postgres
|
||||||
container_name: pgadmin
|
container_name: pgadmin
|
||||||
image: dpage/pgadmin4
|
image: dpage/pgadmin4
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
PGADMIN_DEFAULT_EMAIL: admin@blackfish.dev
|
PGADMIN_DEFAULT_EMAIL: admin@blackfish.dev
|
||||||
PGADMIN_DEFAULT_PASSWORD: password
|
PGADMIN_DEFAULT_PASSWORD: password
|
||||||
@ -50,7 +50,7 @@ services:
|
|||||||
- pacs
|
- pacs
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres
|
- postgres
|
||||||
|
|
||||||
ohif:
|
ohif:
|
||||||
container_name: ohif
|
container_name: ohif
|
||||||
image: ohif/viewer
|
image: ohif/viewer
|
||||||
@ -62,21 +62,20 @@ services:
|
|||||||
- ${NGINX_DEFAULT_CONF}:/etc/nginx/conf.d/default.conf:ro
|
- ${NGINX_DEFAULT_CONF}:/etc/nginx/conf.d/default.conf:ro
|
||||||
- ${VIEWER_CONFIG}:/usr/share/nginx/html/app-config.js:ro
|
- ${VIEWER_CONFIG}:/usr/share/nginx/html/app-config.js:ro
|
||||||
- ./logo.png:/usr/share/nginx/html/logo.png:ro
|
- ./logo.png:/usr/share/nginx/html/logo.png:ro
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
- pacs
|
- pacs
|
||||||
|
|
||||||
meddream:
|
meddream:
|
||||||
image: meddream/dicom-viewer:8.5.0
|
image: meddream/dicom-viewer
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- "80:8080"
|
- "80:8080"
|
||||||
networks:
|
|
||||||
- pacs
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./config/meddream/application.properties:/opt/meddream/application.properties:ro
|
- ./config/meddream/application.properties:/opt/meddream/application.properties
|
||||||
#- ./config/meddream/license:/opt/meddream/license:ro
|
- ./config/meddream/license:/opt/meddream/license
|
||||||
- ./config/meddream/system.json:/opt/meddream/sys/settings/system.json:ro
|
- ./config/meddream/system.json:/opt/meddream/sys/settings/system.json
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
pacs:
|
pacs:
|
||||||
|
2
volumes/pg_data/.gitignore
vendored
Normal file
2
volumes/pg_data/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
*
|
||||||
|
!.gitignore
|
Loading…
Reference in New Issue
Block a user