diff --git a/.all-contributorsrc b/.all-contributorsrc
index cdb7fcad8..fbb92652b 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -58,6 +58,15 @@
"contributions": [
"question"
]
+ },
+ {
+ "login": "diego0020",
+ "name": "diego0020",
+ "avatar_url": "https://avatars3.githubusercontent.com/u/7297450?v=4",
+ "profile": "https://github.com/diego0020",
+ "contributions": [
+ "code"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.md b/README.md
index 149f16790..1c77efc31 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@
[![CircleCI][circleci-image]][circleci-url]
[![codecov][codecov-image]][codecov-url]
-[](#contributors)
+[](#contributors)
[![code style: prettier][prettier-image]][prettier-url]
[![semantic-release][semantic-image]][semantic-url]
@@ -190,7 +190,7 @@ Thanks goes to these wonderful people
-
+
diff --git a/docker/Nginx-Orthanc/docker-compose.yml b/docker/Nginx-Orthanc/docker-compose.yml
index 26e797514..62cf8df25 100644
--- a/docker/Nginx-Orthanc/docker-compose.yml
+++ b/docker/Nginx-Orthanc/docker-compose.yml
@@ -1,17 +1,6 @@
version: '3.5'
services:
- proxy:
- image: nginx:1.15-alpine
- ports:
- - 8899:80
- volumes:
- - ./config/nginx.conf:/etc/nginx/nginx.conf:ro
- restart: unless-stopped
-
- # LINK: https://hub.docker.com/r/jodogne/orthanc-plugins/
- # TODO: Update to use Postgres
- # https://github.com/mrts/docker-postgresql-multiple-databases
orthanc:
image: jodogne/orthanc-plugins:1.5.6
hostname: orthanc
@@ -20,7 +9,7 @@ services:
- ./config/orthanc.json:/etc/orthanc/orthanc.json:ro
# Persist data
- ./volumes/orthanc-db/:/var/lib/orthanc/db/
- # ports:
- # - '4242:4242' # DICOM
- # - '8042:8042' # Web
+ ports:
+ - '4242:4242' # DICOM
+ - '8042:8042' # Web
restart: unless-stopped
diff --git a/docs/latest/essentials/data-source.md b/docs/latest/essentials/data-source.md
index 7d828e8a0..c47f794d5 100644
--- a/docs/latest/essentials/data-source.md
+++ b/docs/latest/essentials/data-source.md
@@ -29,11 +29,17 @@ For our purposes, we will be using `Orthanc`, but you can see a list of
- Docker
- [Docker for Mac](https://docs.docker.com/docker-for-mac/)
- - [Docker for Windows](https://docs.docker.com/docker-for-windows/)
+ - [Docker for Windows (recommended)](https://docs.docker.com/docker-for-windows/)
+ - [Docker Toolbox for Windows](https://docs.docker.com/toolbox/toolbox_install_windows/)
_Not sure if you have `docker` installed already? Try running `docker --version`
in command prompt or terminal_
+> If you are using `Docker Toolbox` you need to change the _proxy_ parameter in
+> _package.json_ to http://192.168.99.100:8042 or the ip docker-machine ip
+> throws. This is the value [`react-scripts`][react-proxy] uses to proxy
+> requests
+
### Running Orthanc
_Start Orthanc:_
@@ -112,7 +118,7 @@ window.config = {
},
],
},
-}
+};
```
To learn more about how you can configure the OHIF Viewer, check out our
@@ -142,6 +148,7 @@ _Feel free to make a Pull Request if you want to add to this list._
[dicom-web]: https://en.wikipedia.org/wiki/DICOMweb
[storescu]: http://support.dcmtk.org/docs/storescu.html
[cra-start]: https://github.com/facebook/create-react-app#npm-start-or-yarn-start
+[react-proxy]: https://facebook.github.io/create-react-app/docs/proxying-api-requests-in-development#configuring-the-proxy-manually
[dcm4chee]: https://github.com/dcm4che/dcm4chee-arc-light
[dcm4chee-docker]: https://github.com/dcm4che/dcm4chee-arc-light/wiki/Running-on-Docker
diff --git a/package.json b/package.json
index 319ea3c8c..3b64946e3 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"node": ">=8",
"npm": ">=5"
},
+ "proxy": "http://localhost:8042",
"scripts": {
"cm": "npx git-cz",
"dev": "yarn run preBuild && cross-env PORT=5000 react-scripts start",
diff --git a/public/config/docker_nginx-orthanc.js b/public/config/docker_nginx-orthanc.js
index b184c5a9d..b200b4b9f 100644
--- a/public/config/docker_nginx-orthanc.js
+++ b/public/config/docker_nginx-orthanc.js
@@ -5,9 +5,9 @@ window.config = {
dicomWeb: [
{
name: 'Orthanc',
- wadoUriRoot: 'http://localhost:8899/wado',
- qidoRoot: 'http://localhost:8899/dicom-web',
- wadoRoot: 'http://localhost:8899/dicom-web',
+ wadoUriRoot: '/wado',
+ qidoRoot: '/dicom-web',
+ wadoRoot: '/dicom-web',
qidoSupportsIncludeField: false,
imageRendering: 'wadors',
thumbnailRendering: 'wadors',
@@ -17,4 +17,4 @@ window.config = {
},
],
},
-}
+};
diff --git a/src/utils/initWebWorkers.js b/src/utils/initWebWorkers.js
index a2b0bd8fc..610f30391 100644
--- a/src/utils/initWebWorkers.js
+++ b/src/utils/initWebWorkers.js
@@ -17,7 +17,7 @@ export default function initWebWorkers(
if (scriptsPath[scriptsPath.length - 1] !== '/') {
scriptsPath += '/';
}
-
+
const config = {
maxWebWorkers: Math.max(navigator.hardwareConcurrency - 1, 1),
startWebWorkersOnDemand: true,
![allcontributors[bot]](https://avatars3.githubusercontent.com/u/46843839?v=4)
