Skip to content

Commit 361d11e

Browse files
authored
Merge pull request #187 from camicroscope/develop
For 3.9.10
2 parents b56e8c4 + f2ade01 commit 361d11e

14 files changed

Lines changed: 217 additions & 521 deletions

caMicroscope.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ services:
1111
max-size: "10m"
1212
volumes:
1313
- ./db:/data/db
14-
idxMongo:
15-
image: mongo:4.2-bionic
16-
container_name: ca-idx
17-
links:
18-
- mongo
19-
volumes:
20-
- ./config:/config
2114
command: bash /config/run_idx.sh
2215
logging:
2316
options:
@@ -27,9 +20,9 @@ services:
2720
- mongo
2821
back:
2922
build:
30-
context: "https://github.com/camicroscope/caracal.git#v3.9.8"
23+
context: "https://github.com/camicroscope/caracal.git#v3.9.10"
3124
args:
32-
viewer: "v3.9.9"
25+
viewer: "v3.9.10"
3326
depends_on:
3427
- "mongo"
3528
ports:
@@ -50,6 +43,7 @@ services:
5043
JWK_URL: "https://www.googleapis.com/oauth2/v3/certs"
5144
IIP_PATH: "http://ca-iip:8080/fcgi-bin/iipsrv.fcgi"
5245
MONGO_URI: "mongodb://ca-mongo"
46+
GENERATE_KEY_IF_MISSING: "true"
5347
iip:
5448
image: camicroscope/iipimage:version-3.8.4
5549
container_name: ca-iip
@@ -61,7 +55,7 @@ services:
6155
volumes:
6256
- ./images/:/images/
6357
loader:
64-
build: "https://github.com/camicroscope/SlideLoader.git#v3.9.8"
58+
build: "https://github.com/camicroscope/SlideLoader.git#v3.9.10"
6559
container_name: ca-load
6660
restart: always
6761
logging:

config/add_users.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

config/admin.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

config/default_data.js

Lines changed: 0 additions & 320 deletions
This file was deleted.

0 commit comments

Comments
 (0)