Merge branch 'master' into feat/handle-access

uc-cdis · Aug 13, 2020 · 22641c7 · 22641c7
2 parents 998b6da + d2c1258
commit 22641c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-# To run: docker run -d -v /path/to/fence-config.yaml:/var/www/fence/fence-config.yaml --name=fence -p 80:80 fence
+# To run: docker run --rm -d -v /path/to/fence-config.yaml:/var/www/fence/fence-config.yaml --name=fence -p 80:80 fence
 # To check running container: docker exec -it fence /bin/bash
 
-FROM quay.io/cdis/python-nginx:pybase3-1.2.0
+FROM quay.io/cdis/python-nginx:pybase3-1.3.0
 
 ENV appname=fence
 

diff --git a/README.md b/README.md
@@ -102,6 +102,7 @@ At the moment, supported IDPs include:
 - Cognito
 - Synapse
 - Microsoft
+- ORCID
 - RAS
 
 ## OIDC & OAuth2