Skip to content

Commit

Permalink
Merge pull request #187 from camicroscope/develop
Browse files Browse the repository at this point in the history
For 3.9.10
  • Loading branch information
birm authored Jan 20, 2022
2 parents b56e8c4 + f2ade01 commit 361d11e
Show file tree
Hide file tree
Showing 14 changed files with 217 additions and 521 deletions.
14 changes: 4 additions & 10 deletions caMicroscope.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@ services:
max-size: "10m"
volumes:
- ./db:/data/db
idxMongo:
image: mongo:4.2-bionic
container_name: ca-idx
links:
- mongo
volumes:
- ./config:/config
command: bash /config/run_idx.sh
logging:
options:
Expand All @@ -27,9 +20,9 @@ services:
- mongo
back:
build:
context: "https://github.com/camicroscope/caracal.git#v3.9.8"
context: "https://github.com/camicroscope/caracal.git#v3.9.10"
args:
viewer: "v3.9.9"
viewer: "v3.9.10"
depends_on:
- "mongo"
ports:
Expand All @@ -50,6 +43,7 @@ services:
JWK_URL: "https://www.googleapis.com/oauth2/v3/certs"
IIP_PATH: "http://ca-iip:8080/fcgi-bin/iipsrv.fcgi"
MONGO_URI: "mongodb://ca-mongo"
GENERATE_KEY_IF_MISSING: "true"
iip:
image: camicroscope/iipimage:version-3.8.4
container_name: ca-iip
Expand All @@ -61,7 +55,7 @@ services:
volumes:
- ./images/:/images/
loader:
build: "https://github.com/camicroscope/SlideLoader.git#v3.9.8"
build: "https://github.com/camicroscope/SlideLoader.git#v3.9.10"
container_name: ca-load
restart: always
logging:
Expand Down
11 changes: 0 additions & 11 deletions config/add_users.js

This file was deleted.

1 change: 0 additions & 1 deletion config/admin.js

This file was deleted.

320 changes: 0 additions & 320 deletions config/default_data.js

This file was deleted.

Loading

0 comments on commit 361d11e

Please sign in to comment.