Merge pull request #106 from camicroscope/develop

For 3.6.2

README.md

@@ -1,8 +1,10 @@
-# caMicroscope Distribution
+<h2 align="center">
+  <a href="http://camicroscope.org/"><img src="https://avatars2.githubusercontent.com/u/12075069?s=400&v=4" style="background-color:rgba(0,0,0,0);" height=230 alt="camicroscope: a web-based image viewer optimized for large bio-medical image data viewing"></a>
+</h2>
 
 [![Build Status](https://travis-ci.org/camicroscope/Distro.svg?branch=master)](https://travis-ci.org/camicroscope/Distro)
 
-caMicroscope 3.X distribution
+# caMicroscope distribution
 
 
 run with `docker-compose -f caMicroscope.yml up`
@@ -37,8 +39,6 @@ Security and Routes - This is handled by the security container. By default rout
 
 Image Volume - This is, by default, the images directory in this directory. If this is changed, please make the same change across all impacted services.
 
-Packages - Packages are built in the viewer service using parcel, mount a different directory with packages.js to the package directory to overwrite or add functionality.
-
 ## PathDB
 
 To use PathDB, use quip-pathdb.yml instead of caMicroscope.yml. This deployment does not include the auth and loader as separate services, as this PathDB provides that functionality.

caMicroscope.yml

@@ -34,29 +34,29 @@ services:
       - ./config/bindaas_projects/:/root/bindaas/bin/projects/
       - ./config/bindaas.config.json:/root/bindaas/bin/bindaas.config.json
   iip:
-    build: "https://github.com/camicroscope/iipImage.git#v3.2.0"
+    build: "https://github.com/caMicroscope/iipImage.git#v3.2.0"
     container_name: ca-iip
     restart: unless-stopped
     volumes:
       - ./images/:/images/
   viewer:
-    build: "https://github.com/camicroscope/caMicroscope.git#v3.6.1"
+    build: "https://github.com/caMicroscope/caMicroscope.git#v3.6.2"
     container_name: ca-front
     restart: unless-stopped
     volumes:
       - ./config/login.html:/usr/local/apache2/htdocs/login.html
     logging:
       driver: none
   loader:
-    build: "https://github.com/camicroscope/SlideLoader.git#v3.5.9"
+    build: "https://github.com/caMicroscope/SlideLoader.git#v3.6.2"
     container_name: ca-load
     restart: unless-stopped
     logging:
       driver: none
     volumes:
       - ./images/:/images/
   security:
-    build: "https://github.com/camicroscope/Security.git#v3.5.2"
+    build: "https://github.com/caMicroscope/Security.git#v3.6.2"
     container_name: ca-security
     restart: unless-stopped
     ports:

develop.yml

@@ -29,22 +29,24 @@ services:
       - ./config/bindaas_projects/:/root/bindaas/bin/projects/
       - ./config/bindaas.config.json:/root/bindaas/bin/bindaas.config.json
   iip:
-    build: "https://github.com/camicroscope/iipImage.git#develop"
+    build: "https://github.com/caMicroscope/iipImage.git#develop"
     container_name: ca-iip
     volumes:
       - ./images/:/images/
   viewer:
-    build: "https://github.com/camicroscope/caMicroscope.git#develop"
+    build: "https://github.com/caMicroscope/caMicroscope.git#develop"
     container_name: ca-front
+    environment:
+      - cacheoff=true
     volumes:
       - ./config/login.html:/usr/local/apache2/htdocs/login.html
   loader:
-    build: "https://github.com/camicroscope/SlideLoader.git#develop"
+    build: "https://github.com/caMicroscope/SlideLoader.git#develop"
     container_name: ca-load
     volumes:
       - ./images/:/images/
   security:
-    build: "https://github.com/camicroscope/Security.git#develop"
+    build: "https://github.com/caMicroscope/Security.git#develop"
     container_name: ca-security
     ports:
       - "4010:4010"
@@ -57,6 +59,6 @@ services:
     build: "./Deps/auth_service/"
     volumes:
       - ./jwt_keys/:/keys/
-    environment:
-      JWKS: "https://birmstuff.auth0.com/.well-known/jwks.json"
     container_name: ca-auth
+    environment:
+      JWKS: "https://www.googleapis.com/oauth2/v3/certs"

quip-pathdb.yml

@@ -39,7 +39,7 @@ services:
     volumes:
       - ./images/:/data/images/
   security:
-    build: "https://github.com/camicroscope/Security.git#v3.5.2"
+    build: "https://github.com/camicroscope/Security.git#v3.6.2"
     container_name: ca-security
     restart: unless-stopped
     ports: ["4010:4010"]
@@ -56,7 +56,7 @@ services:
     build:
       context: "https://github.com/SBU-BMI/PathDB.git#1.3.5"
       args:
-        viewer: "v3.6.1"
+        viewer: "v3.6.2"
     container_name: quip-pathdb
     restart: unless-stopped
     ports: ["443:443","80:80"]