Skip to content

Commit

Permalink
Merge pull request #198 from camicroscope/develop
Browse files Browse the repository at this point in the history
For 3.10.0
  • Loading branch information
birm authored Oct 25, 2022
2 parents 630ed5b + 0348480 commit 6a523fe
Show file tree
Hide file tree
Showing 6 changed files with 543 additions and 13 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Docker Compose Test
on: push
jobs:
test:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- name: Build the develop stack
run: docker-compose -f develop.yml build
6 changes: 3 additions & 3 deletions caMicroscope.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ services:
- ./db:/data/db
back:
build:
context: "https://github.com/camicroscope/caracal.git#v3.9.11"
context: "https://github.com/camicroscope/caracal.git#v3.10.0"
args:
viewer: "v3.9.11"
viewer: "v3.10.0"
depends_on:
- "mongo"
ports:
Expand Down Expand Up @@ -48,7 +48,7 @@ services:
volumes:
- ./images/:/images/
loader:
build: "https://github.com/camicroscope/SlideLoader.git#v3.9.11"
build: "https://github.com/camicroscope/SlideLoader.git#v3.10.0"
container_name: ca-load
restart: always
logging:
Expand Down
Loading

0 comments on commit 6a523fe

Please sign in to comment.