Merge pull request #7054 from owncloud/fix_ocis_docker_compose_service

Fix docker-compose dev env for latest ocis
owncloud · May 24, 2022 · 7984af8 · 7984af8
2 parents 27cc51d + 04543bc
commit 7984af8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/dev/docker/ocis.entrypoint.sh b/dev/docker/ocis.entrypoint.sh
@@ -2,8 +2,4 @@
 set -eo pipefail
 [[ "${DEBUG}" == "true" ]] && set -x
 
-if [ ! -e "/var/lib/ocis/.ocis/config/ocis.yaml" ]; then
-    /usr/bin/ocis init
-fi
-
-/usr/bin/ocis server
+exec /usr/bin/ocis server
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,6 +16,14 @@ services:
       IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-true}"
       IDM_ADMIN_PASSWORD: "${ADMIN_PASSWORD:-admin}" # override the random admin password from `ocis init`
       OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error}
+      OCIS_LOG_PRETTY: "true"
+      OCIS_LOG_COLOR: "true"
+      OCIS_SYSTEM_USER_ID: "some-system-user-id-000-000000000000"
+      OCIS_ADMIN_USER_ID: "some-admin-user-id-0000-000000000000"
+      OCIS_SYSTEM_USER_API_KEY: "some-system-user-machine-auth-api-key"
+      GROUPS_LDAP_BIND_PASSWORD: "some-ldap-reva-password"
+      USERS_LDAP_BIND_PASSWORD: "some-ldap-reva-password"
+      AUTH_BASIC_LDAP_BIND_PASSWORD: "some-ldap-reva-password"
     volumes:
       - ./dev/docker/ocis.entrypoint.sh:/usr/bin/entrypoint
       - ./dist:/web/dist:ro