diff --git a/docker/README.md b/docker/README.md index e4562d1cc..445a4e37f 100644 --- a/docker/README.md +++ b/docker/README.md @@ -20,4 +20,23 @@ then, access the application at (http://localhost)[http://localhost] #### run `$ docker-compose -f docker-compose-orthanc.yml up -d` -then, access the application at (http://localhost)[http://localhost] \ No newline at end of file +then, access the application at (http://localhost)[http://localhost] + +**remember that you have to access orthanc application and include your studies there** + +## Local Dcm4che +#### build + +`$ docker-compose -f docker-compose-dcm4che.yml build` + +#### run +`$ docker-compose -f docker-compose-orthanc.yml up -d` + +then, access the application at (http://localhost)[http://localhost] + +**remember that you have to access dcm4che application and include your studies there** +You can use the following command to import your studies into dcm4che + +`$ docker run -v {YOUR_STUDY_FOLDER}:/tmp --rm --network=docker_dcm4chee_default dcm4che/dcm4che-tools:5.14.0 storescu -cDCM4CHEE@arc:11112 /tmp` + +**make sure that your Docker network name is docker_dcm4chee_default or change it to the right one** \ No newline at end of file diff --git a/docker/dcm4che/docker-compose-dcm4che.env b/docker/dcm4che/docker-compose-dcm4che.env new file mode 100644 index 000000000..54961c376 --- /dev/null +++ b/docker/dcm4che/docker-compose-dcm4che.env @@ -0,0 +1,4 @@ +STORAGE_DIR=/storage/fs1 +POSTGRES_DB=pacsdb +POSTGRES_USER=pacs +POSTGRES_PASSWORD=pacs diff --git a/docker/dcm4che/etc/localtime b/docker/dcm4che/etc/localtime new file mode 100644 index 000000000..e69de29bb diff --git a/docker/dcm4che/etc/timezone b/docker/dcm4che/etc/timezone new file mode 100644 index 000000000..27f725e77 --- /dev/null +++ b/docker/dcm4che/etc/timezone @@ -0,0 +1 @@ +America/New_York \ No newline at end of file diff --git a/docker/docker-compose-dcm4che.yml b/docker/docker-compose-dcm4che.yml new file mode 100644 index 000000000..db5f71c0d --- /dev/null +++ b/docker/docker-compose-dcm4che.yml @@ -0,0 +1,78 @@ +version: '3.5' + +services: + + ldap: + image: dcm4che/slapd-dcm4chee:2.4.44-15.0 + logging: + driver: json-file + options: + max-size: "10m" + ports: + - "389:389" + env_file: ./dcm4che/docker-compose-dcm4che.env + volumes: + - ./dcm4che/etc/localtime:/etc/localtime:ro + - ./dcm4che/etc/timezone:/etc/timezone:ro + - ./dcm4che/dcm4chee-arc/ldap:/var/lib/ldap + - ./dcm4che/dcm4chee-arc/slapd.d:/etc/ldap/slapd.d + networks: + - dcm4chee_default + db: + image: dcm4che/postgres-dcm4chee:11.1-15 + logging: + driver: json-file + options: + max-size: "10m" + ports: + - "5432:5432" + env_file: ./dcm4che/docker-compose-dcm4che.env + volumes: + - ./dcm4che/etc/localtime:/etc/localtime:ro + - ./dcm4che/etc/timezone:/etc/timezone:ro + - ./dcm4che/dcm4chee-arc/db:/var/lib/postgresql/data + networks: + - dcm4chee_default + arc: + image: dcm4che/dcm4chee-arc-psql:5.15.0 + logging: + driver: json-file + options: + max-size: "10m" + ports: + - "8080:8080" + - "8443:8443" + - "9990:9990" + - "11112:11112" + - "2575:2575" + env_file: ./dcm4che/docker-compose-dcm4che.env + environment: + WILDFLY_CHOWN: /opt/wildfly/standalone /storage + WILDFLY_WAIT_FOR: ldap:389 db:5432 + depends_on: + - ldap + - db + volumes: + - ./dcm4che/etc/localtime:/etc/localtime:ro + - ./dcm4che/etc/timezone:/etc/timezone:ro + - ./dcm4che/dcm4chee-arc/wildfly:/opt/wildfly/standalone + - ./dcm4che/dcm4chee-arc/storage:/storage + networks: + - dcm4chee_default + viewer: + container_name: ohif-viewer + build: + context: ../ + dockerfile: Dockerfile + ports: + - '80:80' + # depends_on: + # - orthanc + environment: + - NODE_ENV=production + restart: always + networks: + - dcm4chee_default + +networks: + dcm4chee_default: \ No newline at end of file diff --git a/example/index.html b/example/index.html index 76aeb6c05..2b233f655 100644 --- a/example/index.html +++ b/example/index.html @@ -103,20 +103,35 @@ // Try going to: // http://localhost:5000/viewer/1.3.6.1.4.1.14519.5.2.1.1706.4996.216859690032335293073513900362 props.servers = { + // "dicomWeb": [ + // { + // "name": "Orthanc", + // "wadoUriRoot": "http://localhost:8899/wado", + // "qidoRoot": "http://localhost:8899/dicom-web", + // "wadoRoot": "http://localhost:8899/dicom-web", + // "qidoSupportsIncludeField": false, + // "imageRendering": "wadors", + // "thumbnailRendering": "wadors", + // "requestOptions": { + // "auth": "orthanc:orthanc", + // "logRequests": true, + // "logResponses": false, + // "logTiming": true + // } + // } + // ] "dicomWeb": [ { - "name": "Orthanc", - "wadoUriRoot": "http://localhost:8899/wado", - "qidoRoot": "http://localhost:8899/dicom-web", - "wadoRoot": "http://localhost:8899/dicom-web", - "qidoSupportsIncludeField": false, + "name": "DCM4CHEE", + "wadoUriRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/wado", + "qidoRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/rs", + "wadoRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/rs", + "qidoSupportsIncludeField": true, "imageRendering": "wadors", "thumbnailRendering": "wadors", "requestOptions": { - "auth": "orthanc:orthanc", - "logRequests": true, - "logResponses": false, - "logTiming": true + "requestFromBrowser": true, + "auth": "admin:admin" } } ]