From ed79a2090532026fe1b3e9aebf6a6b15aeec5193 Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Thu, 19 May 2022 16:42:53 +0545 Subject: [PATCH] enclose boolean with string in docker-compose env --- .../examples/oc10_ocis_parallel/docker-compose.yml | 2 +- deployments/examples/ocis_hello/docker-compose.yml | 2 +- deployments/examples/ocis_ldap/docker-compose.yml | 3 +-- deployments/examples/ocis_s3/docker-compose.yml | 8 ++++++-- deployments/examples/ocis_traefik/docker-compose.yml | 3 +-- deployments/examples/ocis_wopi/docker-compose.yml | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index a1d137df193..794f9be70fd 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -126,7 +126,7 @@ services: PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: true # https://github.com/owncloud/ocis/issues/3812 + GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" volumes: diff --git a/deployments/examples/ocis_hello/docker-compose.yml b/deployments/examples/ocis_hello/docker-compose.yml index 34a36e716a3..58c0da40b86 100644 --- a/deployments/examples/ocis_hello/docker-compose.yml +++ b/deployments/examples/ocis_hello/docker-compose.yml @@ -60,7 +60,7 @@ services: SETTINGS_GRPC_ADDR: 0.0.0.0:9191 # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: true # https://github.com/owncloud/ocis/issues/3812 + GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml index 019045c53bb..45cbc62e7be 100644 --- a/deployments/examples/ocis_ldap/docker-compose.yml +++ b/deployments/examples/ocis_ldap/docker-compose.yml @@ -55,7 +55,6 @@ services: # therefore we ignore the error and then start the ocis server command: ["-c", "ocis init || true; ocis server"] environment: - # users/gropups from ldap LDAP_URI: ldaps://ldap-server LDAP_INSECURE: "true" @@ -81,7 +80,7 @@ services: PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: true # https://github.com/owncloud/ocis/issues/3812 + GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password diff --git a/deployments/examples/ocis_s3/docker-compose.yml b/deployments/examples/ocis_s3/docker-compose.yml index ec48ecea954..93fb12bb7e1 100644 --- a/deployments/examples/ocis_s3/docker-compose.yml +++ b/deployments/examples/ocis_s3/docker-compose.yml @@ -67,7 +67,7 @@ services: STORAGE_USERS_S3NG_BUCKET: ${MINIO_BUCKET:-ocis-bucket} # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: true # https://github.com/owncloud/ocis/issues/3812 + GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password @@ -94,7 +94,11 @@ services: ocis-net: entrypoint: - /bin/sh - command: ["-c", "mkdir -p /data/${MINIO_BUCKET:-ocis-bucket} && minio server --console-address ':9001' /data"] + command: + [ + "-c", + "mkdir -p /data/${MINIO_BUCKET:-ocis-bucket} && minio server --console-address ':9001' /data", + ] volumes: - minio-data:/data environment: diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml index 3681efe4e48..6b4e8bad22f 100644 --- a/deployments/examples/ocis_traefik/docker-compose.yml +++ b/deployments/examples/ocis_traefik/docker-compose.yml @@ -58,7 +58,7 @@ services: PROXY_TLS: "false" # do not use SSL between Traefik and oCIS # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: true # https://github.com/owncloud/ocis/issues/3812 + GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password @@ -84,6 +84,5 @@ volumes: ocis-config: ocis-data: - networks: ocis-net: diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index 7bde4243627..e5b348e0322 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -62,7 +62,7 @@ services: GATEWAY_GRPC_ADDR: 0.0.0.0:9142 # make the REVA gateway accessible to the app drivers # INSECURE: needed if oCIS / Traefik is using self generated certificates OCIS_INSECURE: "${INSECURE:-false}" - GRAPH_LDAP_INSECURE: true # https://github.com/owncloud/ocis/issues/3812 + GRAPH_LDAP_INSECURE: "true" # https://github.com/owncloud/ocis/issues/3812 # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" # admin user password