sync version

.env.sample

@@ -3,18 +3,23 @@ TYPE=ocis
 DOMAIN={{ .Domain }}
 LETS_ENCRYPT_ENV=production
 
-# oidc config
+# Make true if using OIDC and you want accounts to be created automatically
 PROXY_AUTOPROVISION_ACCOUNTS=false
-# set OIDC realm url
+
+# OIDC realm URL, e.g. https://keycloak.example.org/realm/example
 OCIS_OIDC_ISSUER=
-# set OIDC client id
+
+# OIDC client ID
+# Note that the client has to be in public mode (not confidential mode) and
+# does therefore not need a client secret.
 WEB_OIDC_CLIENT_ID=
 
-# general config
+# General config
 OCIS_LOG_LEVEL=error
 OCIS_LOG_COLOR=false
 
-# do not use SSL between Traefik and oCIS
+# Keep as false if using a reverse proxy
 PROXY_TLS=false 
-# set to true if using self signed certs
+
+# Set to true if using self signed certs
 OCIS_INSECURE=false

README.md

@@ -21,3 +21,13 @@
    your Docker swarm box
 5. `abra app YOURAPPDOMAIN deploy`
 
+## SSO usage
+
+By default OCIS includes a built-in Identity Provider. You can use another OpenID Connect provider, too. Keycloak works: Create a new Client, set it to Public mode (not Confidential) and set the `OCIS_OIDC_ISSUER` and `WEB_OIDC_CLIENT_ID` config variables.
+
+## App commands
+
+### `ocis`
+
+To run the `ocis` command-line utility you can use the abra command `ocis`. Use it like this:
+`abra app cmd YOURAPPDOMAIN app ocis`

abra.sh

@@ -1,5 +1,9 @@
 export APP_ENTRYPOINT_VERSION=v2
 
 ocis() {
-  ocis $@
+  echo "1: $1"
+  echo "2: $2"
+  echo "all: $@"
+
+  /usr/bin/ocis "$@"
 }

compose.yml

@@ -9,15 +9,17 @@ services:
         target: /docker-entrypoint.sh
         mode: 0555
     environment:
-      - PROXY_TLS="false"
-      - OCIS_INSECURE="false"
-      - IDM_CREATE_DEMO_USERS="false"
-      - PROXY_AUTOPROVISION_ACCOUNTS="false"
-      - OCIS_URL=${DOMAIN}
+      - PROXY_TLS=false
+      - OCIS_INSECURE=false
+      - DEMO_USERS=false
+      - IDM_CREATE_DEMO_USERS=false
+      - PROXY_AUTOPROVISION_ACCOUNTS=true
+      - OCIS_URL=https://${DOMAIN}
       - OCIS_LOG_LEVEL=error
-      - OCIS_LOG_COLOR="false"
+      - OCIS_LOG_COLOR=false
       - OCIS_OIDC_ISSUER=
       - WEB_OIDC_CLIENT_ID=
+      - OCIS_OIDC_CLIENT_ID=
     volumes:
       - config:/etc/ocis
       - data:/var/lib/ocis
@@ -39,7 +41,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/etc/ocis/,/var/lib/ocis/"
-        - coop-cloud.${STACK_NAME}.version=2.0.0-beta.5
+        - coop-cloud.${STACK_NAME}.version=0.1.0+2.0.0-beta.5
           
 
 networks: