diff --git a/caMicroscope.yml b/caMicroscope.yml index ac94225..aafb001 100644 --- a/caMicroscope.yml +++ b/caMicroscope.yml @@ -13,9 +13,9 @@ services: - ./db:/data/db back: build: - context: "https://github.com/camicroscope/caracal.git#v3.11.0" + context: "https://github.com/camicroscope/caracal.git#v3.12.0" args: - viewer: "v3.11.0" + viewer: "v3.12.0" depends_on: - "mongo" ports: @@ -49,7 +49,7 @@ services: volumes: - ./images/:/images/ loader: - build: "https://github.com/camicroscope/SlideLoader.git#v3.11.0" + build: "https://github.com/camicroscope/SlideLoader.git#v3.12.0" container_name: ca-load restart: always logging: @@ -62,7 +62,10 @@ services: DICOM_PORT: "11112" DICOM_UI_PORT: "8042" dicomsrv: - build: "https://github.com/camicroscope/dicomsrv.git#v3.11.0" + build: + context: "https://github.com/camicroscope/dicomsrv.git#v3.11.1" + args: + indexer: "v3.12.0" container_name: ca-dicomsrv restart: unless-stopped stdin_open: true diff --git a/config/contentSecurityPolicy.json b/config/contentSecurityPolicy.json index 9849750..1ab8bb6 100644 --- a/config/contentSecurityPolicy.json +++ b/config/contentSecurityPolicy.json @@ -17,6 +17,10 @@ "cdn.datatables.net", "maxcdn.bootstrapcdn.com" ], +"connectSrc": [ + "'self'", + "*" +], "styleSrc": [ "'self'", "'unsafe-inline'", diff --git a/config/routes.json b/config/routes.json index 4c0fcfa..908acaf 100644 --- a/config/routes.json +++ b/config/routes.json @@ -114,7 +114,13 @@ "route":"/data/Mark/find", "method":"get", "handlers":[ - {"function":"mongoFind", "args": ["camic", "mark"]} + {"function":"mongoPaginatedFind", "args": ["camic", "mark"]} + ] + },{ + "route":"/data/Mark/count", + "method":"get", + "handlers":[ + {"function":"mongoCount", "args": ["camic", "mark"]} ] },{ "route":"/data/Mark/post", @@ -147,6 +153,12 @@ "handlers":[ {"function":"mongoDistinct", "args": ["camic", "mark", "provenance.analysis"]} ] + },{ + "route":"/data/Mark/provenances", + "method":"get", + "handlers":[ + {"function":"mongoDistinct", "args": ["camic", "mark", "provenance"]} + ] },{ "route":"/data/Mark/multi", "method":"post", diff --git a/develop.yml b/develop.yml index 9ad7486..fa95b43 100644 --- a/develop.yml +++ b/develop.yml @@ -16,7 +16,9 @@ services: - "mongo" ports: - "4010:4010" + - "9229:9229" container_name: ca-back + command: node --inspect=0.0.0.0:9229 --prof caracal.js volumes: - ./config/login.html:/src/static/login.html - ./jwt_keys/:/src/keys/ @@ -28,6 +30,7 @@ services: MONGO_URI: "mongodb://ca-mongo" DISABLE_SEC: "true" ALLOW_PUBLIC: "true" + NUM_THREADS: 1 iip: build: "https://github.com/camicroscope/iipImage.git#develop" container_name: ca-iip diff --git a/kc_caMicroscope.yml b/kc_caMicroscope.yml index 98715a1..0be9fdd 100644 --- a/kc_caMicroscope.yml +++ b/kc_caMicroscope.yml @@ -51,9 +51,9 @@ services: - ./db:/data/db back: build: - context: "https://github.com/camicroscope/caracal.git#v3.10.0" + context: "https://github.com/camicroscope/caracal.git#v3.12.0" args: - viewer: "v3.10.1" + viewer: "v3.12.0" depends_on: - "mongo" ports: @@ -76,7 +76,7 @@ services: MONGO_URI: "mongodb://ca-mongo" GENERATE_KEY_IF_MISSING: "true" iip: - image: camicroscope/iipimage:version-3.10.2 + image: camicroscope/iipimage:version-3.11.0 container_name: ca-iip logging: options: @@ -86,7 +86,7 @@ services: volumes: - ./images/:/images/ loader: - build: "https://github.com/camicroscope/SlideLoader.git#v3.10.0" + build: "https://github.com/camicroscope/SlideLoader.git#v3.12.0" container_name: ca-load restart: always logging: @@ -95,3 +95,23 @@ services: max-size: "10m" volumes: - ./images/:/images/ + environment: + DICOM_PORT: "11112" + DICOM_UI_PORT: "8042" + dicomsrv: + build: "https://github.com/camicroscope/dicomsrv.git#v3.11.1" + container_name: ca-dicomsrv + restart: unless-stopped + stdin_open: true + tty: true + ports: + - "8042:8042" + - "11112:11112" + volumes: + - ./jwt_keys/:/root/keys/ + - ./images/:/images/ + - ./config/OrthancConfiguration.json:/root/src/Configuration.json + environment: + DICOM_PORT: "11112" + DICOM_UI_PORT: "8042" + CARACAL_BACK_HOST_PORT: "ca-back:4010" \ No newline at end of file diff --git a/quip-pathdb.yml b/quip-pathdb.yml index 46db5cf..d440106 100644 --- a/quip-pathdb.yml +++ b/quip-pathdb.yml @@ -15,9 +15,9 @@ services: - ./images/:/data/images/ back: build: - context: "https://github.com/camicroscope/caracal.git#v3.11.0" + context: "https://github.com/camicroscope/caracal.git#v3.12.0" args: - viewer: "v3.11.0" + viewer: "v3.12.0" depends_on: - "mongo" ports: @@ -37,7 +37,7 @@ services: build: context: "https://github.com/SBU-BMI/PathDB.git#2.0.0" args: - viewer: "v3.11.0" + viewer: "v3.11.1" container_name: quip-pathdb restart: unless-stopped ports: ["443:443","80:80"] @@ -61,7 +61,7 @@ services: volumes: - ./data:/data heatmaploader: - build: "https://github.com/SBU-BMI/uploadHeatmaps.git#v1.5.4" + build: "https://github.com/SBU-BMI/uploadHeatmaps.git#v1.5.5" container_name: quip-hmloader volumes: - ./data:/mnt/data/