Compare commits

..

No commits in common. "0f2482d1c91e90b9460801891efc303bbb64c828" and "1fabada0ab240f4ebc4c0f10ba39bacc5afd81a0" have entirely different histories.

3 changed files with 12 additions and 11 deletions

View File

@ -163,7 +163,7 @@
"LoadPrivateDictionary": true,
"Dictionary" : {
"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"]
},
"SynchronousCMove": true,

View File

@ -19,7 +19,7 @@ services:
- postgres
container_name: pgadmin
image: dpage/pgadmin4
restart: unless-stopped
restart: unless-stopped
environment:
PGADMIN_DEFAULT_EMAIL: admin@blackfish.dev
PGADMIN_DEFAULT_PASSWORD: password
@ -50,7 +50,7 @@ services:
- pacs
depends_on:
- postgres
ohif:
container_name: ohif
image: ohif/viewer
@ -62,21 +62,20 @@ services:
- ${NGINX_DEFAULT_CONF}:/etc/nginx/conf.d/default.conf:ro
- ${VIEWER_CONFIG}:/usr/share/nginx/html/app-config.js:ro
- ./logo.png:/usr/share/nginx/html/logo.png:ro
restart: always
restart: always
networks:
- pacs
meddream:
image: meddream/dicom-viewer:8.5.0
image: meddream/dicom-viewer
restart: always
ports:
- "80:8080"
networks:
- pacs
volumes:
- ./config/meddream/application.properties:/opt/meddream/application.properties:ro
#- ./config/meddream/license:/opt/meddream/license:ro
- ./config/meddream/system.json:/opt/meddream/sys/settings/system.json:ro
- ./config/meddream/application.properties:/opt/meddream/application.properties
- ./config/meddream/license:/opt/meddream/license
- ./config/meddream/system.json:/opt/meddream/sys/settings/system.json
networks:
pacs:

2
volumes/pg_data/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*
!.gitignore