diff --git a/caMicroscope.yml b/caMicroscope.yml index 97fbc15..9c94b58 100644 --- a/caMicroscope.yml +++ b/caMicroscope.yml @@ -5,15 +5,11 @@ services: image: mongo:3.6.18-xenial container_name: ca-mongo restart: always - logging: - driver: none volumes: - ./db:/data/db idxMongo: image: mongo:3.6.18-xenial container_name: ca-idx - logging: - driver: none links: - mongo volumes: @@ -23,9 +19,9 @@ services: - mongo back: build: - context: "https://github.com/camicroscope/caracal.git#v3.8.0" + context: "https://github.com/camicroscope/caracal.git#v3.8.2" args: - viewer: "v3.8.1" + viewer: "v3.8.2" depends_on: - "mongo" ports: diff --git a/config/mongo_idx.js b/config/mongo_idx.js index 1b8ad98..4c7d8e7 100644 --- a/config/mongo_idx.js +++ b/config/mongo_idx.js @@ -4,6 +4,7 @@ db.mark.createIndex({"provenance.image.slide": 1, "provenance.analysis.execution db.mark.createIndex({"provenance.image.slide":1,"provenance.analysis.execution_id":1,"provenance.analysis": 1}) db.mark.createIndex({"provenance.image.slide":1,"provenance.analysis": 1}) db.mark.createIndex({"provenance.image.slide": 1, "provenance.analysis.execution_id": 1}) +db.mark.createIndex({"provenance.image.slide": 1, "provenance.analysis.source": 1}) db.mark.createIndex({"provenance.image.slide": 1}) db.slide.createIndex({'study':1, 'specimen': 1, 'name': 1}) db.template.createIndex({'id': 1}) diff --git a/develop.yml b/develop.yml index 9c14363..8b49052 100644 --- a/develop.yml +++ b/develop.yml @@ -4,8 +4,6 @@ services: mongo: image: mongo:3.6.18-xenial container_name: ca-mongo - logging: - driver: none volumes: - ./db:/data/db idxMongo: diff --git a/dh_caMicroscope.yml b/dh_caMicroscope.yml index df3b983..7ecc254 100644 --- a/dh_caMicroscope.yml +++ b/dh_caMicroscope.yml @@ -7,13 +7,9 @@ services: restart: unless-stopped volumes: - ./db:/data/db - logging: - driver: none idxMongo: image: mongo:3.6.18-xenial container_name: ca-idx - logging: - driver: none links: - mongo volumes: @@ -47,7 +43,5 @@ services: image: camicroscope/slideloader:latest container_name: ca-load restart: unless-stopped - logging: - driver: none volumes: - ./images/:/images/ diff --git a/quip-pathdb.yml b/quip-pathdb.yml index ab85e29..aeae69d 100644 --- a/quip-pathdb.yml +++ b/quip-pathdb.yml @@ -7,8 +7,6 @@ services: restart: unless-stopped volumes: - ./db:/data/db - logging: - driver: none idxMongo: image: mongo:3.6.18-xenial container_name: ca-idx @@ -28,9 +26,9 @@ services: - ./images/:/data/images/ back: build: - context: "https://github.com/camicroscope/caracal.git#v3.8.0" + context: "https://github.com/camicroscope/caracal.git#v3.8.2" args: - viewer: "v3.8.1" + viewer: "v3.8.2" depends_on: - "mongo" ports: @@ -49,7 +47,7 @@ services: build: context: "https://github.com/SBU-BMI/PathDB.git#1.3.5" args: - viewer: "v3.8.1" + viewer: "v3.8.2" container_name: quip-pathdb restart: unless-stopped ports: ["443:443","80:80"]