Merge pull request #3666 from wkloucek/reenable-parallel-deployment-in-ci
reenable parallel deployment in ci
This commit is contained in:
Regular → Executable
+42
-27
@@ -6,45 +6,60 @@ policy_selector:
|
||||
policies:
|
||||
- name: ocis
|
||||
routes:
|
||||
- endpoint: "/"
|
||||
- endpoint: /
|
||||
backend: http://localhost:9100
|
||||
- endpoint: "/.well-known/"
|
||||
- endpoint: /.well-known/
|
||||
backend: http://localhost:9130
|
||||
- endpoint: /konnect/
|
||||
backend: http://localhost:9130
|
||||
- endpoint: /signin/
|
||||
backend: http://localhost:9130
|
||||
- endpoint: /archiver
|
||||
backend: http://localhost:9140
|
||||
- type: regex
|
||||
endpoint: "/ocs/v[12].php/cloud/user/signing-key"
|
||||
endpoint: /ocs/v[12].php/cloud/(users?|groups)
|
||||
backend: http://localhost:9110
|
||||
- endpoint: "/ocs/"
|
||||
- endpoint: /ocs/
|
||||
backend: http://localhost:9140
|
||||
- type: query
|
||||
endpoint: "/remote.php/?preview=1"
|
||||
endpoint: /remote.php/?preview=1
|
||||
backend: http://localhost:9115
|
||||
- endpoint: "/remote.php/"
|
||||
- method: REPORT
|
||||
endpoint: /remote.php/dav/
|
||||
backend: http://localhost:9115
|
||||
- type: query
|
||||
endpoint: /dav/?preview=1
|
||||
backend: http://localhost:9115
|
||||
- type: query
|
||||
endpoint: /webdav/?preview=1
|
||||
backend: http://localhost:9115
|
||||
- endpoint: /remote.php/
|
||||
service: com.owncloud.web.ocdav
|
||||
- endpoint: /dav/
|
||||
service: com.owncloud.web.ocdav
|
||||
- endpoint: /webdav/
|
||||
service: com.owncloud.web.ocdav
|
||||
- endpoint: /status.php
|
||||
service: com.owncloud.web.ocdav
|
||||
- endpoint: /index.php/
|
||||
service: com.owncloud.web.ocdav
|
||||
- endpoint: /apps/
|
||||
service: com.owncloud.web.ocdav
|
||||
- endpoint: /data
|
||||
backend: http://localhost:9140
|
||||
- endpoint: "/dav/"
|
||||
- endpoint: /app/
|
||||
backend: http://localhost:9140
|
||||
- endpoint: "/webdav/"
|
||||
backend: http://localhost:9140
|
||||
- endpoint: "/status.php"
|
||||
backend: http://localhost:9140
|
||||
- endpoint: "/index.php/"
|
||||
backend: http://localhost:9140
|
||||
- endpoint: "/index.php/login"
|
||||
backend: http://localhost:9100
|
||||
- endpoint: "/login"
|
||||
backend: http://localhost:9100
|
||||
- endpoint: "/data"
|
||||
backend: http://localhost:9140
|
||||
- endpoint: "/graph/"
|
||||
- endpoint: /graph/
|
||||
backend: http://localhost:9120
|
||||
- endpoint: "/app/"
|
||||
backend: http://localhost:9140
|
||||
- endpoint: "/archiver"
|
||||
backend: http://localhost:9140
|
||||
- endpoint: "/graph-explorer/"
|
||||
- endpoint: /graph-explorer
|
||||
backend: http://localhost:9135
|
||||
- endpoint: "/api/v0/settings"
|
||||
- endpoint: /api/v0/accounts
|
||||
backend: http://localhost:9181
|
||||
- endpoint: /accounts.js
|
||||
backend: http://localhost:9181
|
||||
- endpoint: /api/v0/settings
|
||||
backend: http://localhost:9190
|
||||
- endpoint: "/settings.js"
|
||||
- endpoint: /settings.js
|
||||
backend: http://localhost:9190
|
||||
- name: oc10
|
||||
routes:
|
||||
|
||||
@@ -43,88 +43,94 @@ services:
|
||||
driver: "local"
|
||||
restart: always
|
||||
|
||||
ocis-init-volumes:
|
||||
image: busybox
|
||||
entrypoint:
|
||||
- /bin/sh
|
||||
# prepare the oCIS config volume for oCIS
|
||||
command: ["-c", "chown -R 33:33 /etc/ocis /var/lib/ocis"]
|
||||
volumes:
|
||||
- ocis-config:/etc/ocis
|
||||
- ocis-data:/var/lib/ocis
|
||||
|
||||
ocis:
|
||||
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
|
||||
networks:
|
||||
ocis-net:
|
||||
user: "33:33" # equals the user "www-data" for oC10
|
||||
entrypoint:
|
||||
- /bin/sh
|
||||
# run ocis init to initialize a configuration file with random secrets
|
||||
# it will fail on subsequent runs, because the config file already exists
|
||||
# therefore we ignore the error and then start the ocis server
|
||||
command: ["-c", "ocis init || true; ocis server"]
|
||||
#entrypoint:
|
||||
# - /bin/sh
|
||||
# - /entrypoint-override.sh
|
||||
environment:
|
||||
# Keycloak IDP specific configuration
|
||||
PROXY_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-owncloud}
|
||||
WEB_OIDC_AUTHORITY: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-owncloud}
|
||||
WEB_OIDC_CLIENT_ID: ocis-web
|
||||
OCIS_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-owncloud}
|
||||
WEB_OIDC_METADATA_URL: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-owncloud}/.well-known/openid-configuration
|
||||
STORAGE_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}
|
||||
STORAGE_LDAP_IDP: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-owncloud}
|
||||
WEB_OIDC_CLIENT_ID: ocis-web
|
||||
WEB_OIDC_SCOPE: openid profile email owncloud
|
||||
# external ldap is supposed to be read only
|
||||
GRAPH_IDENTITY_BACKEND: ldap
|
||||
GRAPH_LDAP_SERVER_WRITE_ENABLED: "false"
|
||||
# LDAP bind
|
||||
STORAGE_LDAP_URI: "ldaps://openldap"
|
||||
STORAGE_LDAP_INSECURE: "true"
|
||||
STORAGE_LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com"
|
||||
STORAGE_LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin}
|
||||
LDAP_URI: "ldaps://openldap"
|
||||
LDAP_INSECURE: "true"
|
||||
LDAP_BIND_DN: "cn=admin,dc=owncloud,dc=com"
|
||||
LDAP_BIND_PASSWORD: ${LDAP_ADMIN_PASSWORD:-admin}
|
||||
# LDAP user settings
|
||||
PROXY_AUTOPROVISION_ACCOUNTS: "true" # automatically create users when they login
|
||||
PROXY_ACCOUNT_BACKEND_TYPE: cs3 # proxy should get users from CS3APIS (which gets it from LDAP)
|
||||
PROXY_USER_OIDC_CLAIM: ocis.user.uuid # claim was added in Keycloak
|
||||
PROXY_USER_CS3_CLAIM: userid # equals STORAGE_LDAP_USER_SCHEMA_UID
|
||||
STORAGE_LDAP_GROUP_BASE_DN: "dc=owncloud,dc=com"
|
||||
STORAGE_LDAP_GROUP_SCHEMA_DISPLAYNAME: "cn"
|
||||
STORAGE_LDAP_GROUP_SCHEMA_GID_NUMBER: "gidnumber"
|
||||
STORAGE_LDAP_GROUP_SCHEMA_ID: "cn"
|
||||
STORAGE_LDAP_GROUP_SCHEMA_MAIL: "mail"
|
||||
STORAGE_LDAP_GROUP_SCHEMA_MEMBER: "cn"
|
||||
STORAGE_LDAP_GROUP_OBJECTCLASS: "groupOfUniqueNames"
|
||||
STORAGE_LDAP_GROUPFILTER: "(objectclass=owncloud)"
|
||||
STORAGE_LDAP_USER_BASE_DN: "dc=owncloud,dc=com"
|
||||
STORAGE_LDAP_USER_SCHEMA_USERNAME: "cn"
|
||||
STORAGE_LDAP_USER_SCHEMA_DISPLAYNAME: "displayname"
|
||||
STORAGE_LDAP_USER_SCHEMA_GID_NUMBER: "gidnumber"
|
||||
STORAGE_LDAP_USER_SCHEMA_MAIL: "mail"
|
||||
STORAGE_LDAP_USER_SCHEMA_UID_NUMBER: "uidnumber"
|
||||
STORAGE_LDAP_USER_SCHEMA_ID: "ownclouduuid"
|
||||
STORAGE_LDAP_LOGIN_ATTRIBUTES: "uid,mail"
|
||||
LDAP_GROUP_BASE_DN: "ou=groups,dc=owncloud,dc=com"
|
||||
LDAP_GROUP_OBJECTCLASS: "groupOfUniqueNames"
|
||||
LDAP_GROUP_SCHEMA_DISPLAYNAME: "cn"
|
||||
LDAP_GROUP_SCHEMA_ID: "cn"
|
||||
LDAP_GROUP_SCHEMA_MAIL: "mail"
|
||||
LDAP_GROUP_SCHEMA_MEMBER: "cn"
|
||||
LDAP_GROUPFILTER: "(objectclass=owncloud)"
|
||||
LDAP_LOGIN_ATTRIBUTES: "uid"
|
||||
LDAP_USER_BASE_DN: "ou=users,dc=owncloud,dc=com"
|
||||
LDAP_USER_OBJECTCLASS: "posixAccount"
|
||||
LDAP_USER_SCHEMA_DISPLAYNAME: "displayname"
|
||||
LDAP_USER_SCHEMA_ID: "ownclouduuid"
|
||||
LDAP_USER_SCHEMA_MAIL: "mail"
|
||||
LDAP_USER_SCHEMA_USERNAME: "cn"
|
||||
LDAP_USERFILTER: "(objectclass=owncloud)"
|
||||
# ownCloudSQL storage driver
|
||||
STORAGE_USERS_DRIVER: owncloudsql
|
||||
STORAGE_SYSTEM_DRIVER: ocis # keep system data on ocis storage since this are only small files atm
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_DATADIR: /mnt/data/files
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_UPLOADINFO_DIR: /tmp
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_SHARE_FOLDER: "/Shares"
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_LAYOUT: "{{.Username}}"
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBUSERNAME: owncloud
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPASSWORD: owncloud
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBHOST: oc10-db
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBPORT: 3306
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_DBNAME: owncloud
|
||||
STORAGE_USERS_DRIVER_OWNCLOUDSQL_REDIS_ADDR: redis:6379 # TODO: redis is not yet supported
|
||||
STORAGE_USERS_DRIVER: "owncloudsql"
|
||||
STORAGE_USERS_OWNCLOUDSQL_DATADIR: "/mnt/data/files"
|
||||
STORAGE_USERS_OWNCLOUDSQL_SHARE_FOLDER: "/Shares"
|
||||
STORAGE_USERS_OWNCLOUDSQL_LAYOUT: "{{.Username}}"
|
||||
STORAGE_USERS_OWNCLOUDSQL_DB_USERNAME: "owncloud"
|
||||
STORAGE_USERS_OWNCLOUDSQL_DB_PASSWORD: "owncloud"
|
||||
STORAGE_USERS_OWNCLOUDSQL_DB_HOST: "oc10-db"
|
||||
STORAGE_USERS_OWNCLOUDSQL_DB_PORT: 3306
|
||||
STORAGE_USERS_OWNCLOUDSQL_DB_NAME: "owncloud"
|
||||
# ownCloudSQL sharing driver
|
||||
STORAGE_SHARING_USER_DRIVER: owncloudsql
|
||||
STORAGE_SHARING_USER_SQL_USERNAME: owncloud
|
||||
STORAGE_SHARING_USER_SQL_PASSWORD: owncloud
|
||||
STORAGE_SHARING_USER_SQL_HOST: oc10-db
|
||||
STORAGE_SHARING_USER_SQL_PORT: 3306
|
||||
STORAGE_SHARING_USER_SQL_NAME: owncloud
|
||||
|
||||
SHARING_USER_DRIVER: "owncloudsql"
|
||||
SHARING_USER_OWNCLOUDSQL_DB_USERNAME: "owncloud"
|
||||
SHARING_USER_OWNCLOUDSQL_DB_PASSWORD: "owncloud"
|
||||
SHARING_USER_OWNCLOUDSQL_DB_HOST: "oc10-db"
|
||||
SHARING_USER_OWNCLOUDSQL_DB_PORT: 3306
|
||||
SHARING_USER_OWNCLOUDSQL_DB_NAME: "owncloud"
|
||||
# ownCloud storage readonly
|
||||
OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303
|
||||
# General oCIS config
|
||||
# OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services
|
||||
OCIS_RUN_EXTENSIONS: settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,nats
|
||||
OCIS_RUN_EXTENSIONS: app-registry,app-provider,audit,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav
|
||||
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
|
||||
OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test}
|
||||
PROXY_TLS: "false" # do not use SSL between Traefik and oCIS
|
||||
# change default secrets
|
||||
OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4}
|
||||
STORAGE_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret}
|
||||
OCIS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please}
|
||||
# INSECURE: needed if oCIS / Traefik is using self generated certificates
|
||||
OCIS_INSECURE: "${INSECURE:-false}"
|
||||
# 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}"
|
||||
# demo users
|
||||
ACCOUNTS_DEMO_USERS_AND_GROUPS: "${DEMO_USERS:-false}" # deprecated, remove after switching to LibreIDM
|
||||
IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-false}"
|
||||
volumes:
|
||||
- ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml
|
||||
- ocis-config:/etc/ocis
|
||||
- ocis-data:/var/lib/ocis
|
||||
# shared volume with oC10
|
||||
- oc10-data:/mnt/data
|
||||
@@ -339,6 +345,7 @@ services:
|
||||
|
||||
volumes:
|
||||
certs:
|
||||
ocis-config:
|
||||
ocis-data:
|
||||
keycloak-postgres-data:
|
||||
oc10-mysql-data:
|
||||
|
||||
Reference in New Issue
Block a user