Compare commits

..

No commits in common. "614d72923254de5c413049f0d38e90d01f2a4a24" and "0f2482d1c91e90b9460801891efc303bbb64c828" have entirely different histories.

2 changed files with 5 additions and 10 deletions

View File

@ -17,17 +17,17 @@ authorization.defaultLoginPermissions=SEARCH,EXPORT_ISO,EXPORT_ARCH,FORWARD,REPO
com.softneta.meddream.pacs.configurations[0].type=Orthanc com.softneta.meddream.pacs.configurations[0].type=Orthanc
com.softneta.meddream.pacs.configurations[0].id=Orthanc com.softneta.meddream.pacs.configurations[0].id=Orthanc
com.softneta.meddream.pacs.configurations[0].baseUrl=http://orthanc:8042 com.softneta.meddream.pacs.configurations[0].baseUrl=http://orthanc:8042
com.softneta.meddream.pacs.configurations[0].username=dicom com.softneta.meddream.pacs.configurations[0].username=orthanc
com.softneta.meddream.pacs.configurations[0].password=letmein com.softneta.meddream.pacs.configurations[0].password=orthanc
com.softneta.meddream.pacs.configurations[0].pythonPlugin=true com.softneta.meddream.pacs.configurations[0].pythonPlugin=true
com.softneta.meddream.pacs.configurations[0].searchApiEnabled=true com.softneta.meddream.pacs.configurations[0].searchApiEnabled=true
com.softneta.meddream.pacs.configurations[0].imageApiEnabled=true com.softneta.meddream.pacs.configurations[0].imageApiEnabled=true
# com.softneta.meddream.pacs.configurations[0].dicomCacheDirectory= # com.softneta.meddream.pacs.configurations[0].dicomCacheDirectory=
#com.softneta.meddream.pacs.configurations[0].storeScuAet=BLACKFISH #com.softneta.meddream.pacs.configurations[0].storeScuAet=PACS
#com.softneta.meddream.pacs.configurations[0].storeScuIp=orthanc #com.softneta.meddream.pacs.configurations[0].storeScuIp=orthanc
#com.softneta.meddream.pacs.configurations[0].storeScuPort=4242 #com.softneta.meddream.pacs.configurations[0].storeScuPort=4242
com.softneta.meddream.pacs.configurations[0].storeScpAet=BLACKFISH com.softneta.meddream.pacs.configurations[0].storeScpAet=PACS
com.softneta.meddream.pacs.configurations[0].storeScpIp=orthanc com.softneta.meddream.pacs.configurations[0].storeScpIp=orthanc
com.softneta.meddream.pacs.configurations[0].storeScpPort=4242 com.softneta.meddream.pacs.configurations[0].storeScpPort=4242

View File

@ -1,23 +1,18 @@
services: services:
postgres: postgres:
image: postgres:17 image: postgres
container_name: postgres container_name: postgres
networks: networks:
- pacs - pacs
volumes: volumes:
- ${POSTGRES_DATA_MNT}:${PGDATA} - ${POSTGRES_DATA_MNT}:${PGDATA}
environment: environment:
- PGPASSWORD='secret'
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
- POSTGRES_DB=${POSTGRES_DB} - POSTGRES_DB=${POSTGRES_DB}
- PGDATA=${PGDATA} - PGDATA=${PGDATA}
- PGTZ=${PGTZ} - PGTZ=${PGTZ}
healthcheck:
test: [ "CMD", "pg_isready", "-q", "-d", "${DB_DATABASE}", "-U", "${DB_USERNAME}" ]
retries: 3
timeout: 5s
pgadmin: pgadmin:
depends_on: depends_on: