mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2025-12-24 14:50:39 -05:00
Compare commits
7 Commits
replaceCII
...
useLdapASS
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d18aa00b9 | ||
|
|
2b87df8daf | ||
|
|
5f30c4a987 | ||
|
|
a3586358ca | ||
|
|
4d973d037a | ||
|
|
39d8373122 | ||
|
|
0a0ad56d6a |
@@ -973,7 +973,6 @@ def localApiTestPipeline(ctx):
|
||||
(waitForServices("online-offices", ["collabora:9980", "onlyoffice:443", "fakeoffice:8080"]) if params["collaborationServiceNeeded"] else []) +
|
||||
(waitForClamavService() if params["antivirusNeeded"] else []) +
|
||||
(waitForEmailService() if params["emailNeeded"] else []) +
|
||||
(ldapService() if params["ldapNeeded"] else []) +
|
||||
(waitForLdapService() if params["ldapNeeded"] else []) +
|
||||
opencloudServer(storage, params["accounts_hash_difficulty"], extra_server_environment = params["extraServerEnvironment"], with_wrapper = True, tika_enabled = params["tikaNeeded"]) +
|
||||
(opencloudServer(storage, params["accounts_hash_difficulty"], deploy_type = "federation", extra_server_environment = params["extraServerEnvironment"]) if params["federationServer"] else []) +
|
||||
@@ -982,6 +981,7 @@ def localApiTestPipeline(ctx):
|
||||
localApiTests(name, params["suites"], storage, params["extraTestEnvironment"], run_with_remote_php) +
|
||||
logRequests(),
|
||||
"services": (emailService() if params["emailNeeded"] else []) +
|
||||
(ldapService() if params["ldapNeeded"] else []) +
|
||||
(clamavService() if params["antivirusNeeded"] else []) +
|
||||
((fakeOffice() + collaboraService() + onlyofficeService()) if params["collaborationServiceNeeded"] else []),
|
||||
"depends_on": getPipelineNames(buildOpencloudBinaryForTesting(ctx)),
|
||||
@@ -2862,9 +2862,8 @@ def ldapService():
|
||||
{
|
||||
"name": "ldap-server",
|
||||
"image": OPENLDAP,
|
||||
"detach": True,
|
||||
"environment": {
|
||||
"BITNAMI_DEBUG": "true",
|
||||
"BITNAMI_DEBUG": True,
|
||||
"LDAP_TLS_VERIFY_CLIENT": "never",
|
||||
"LDAP_ENABLE_TLS": "yes",
|
||||
"LDAP_TLS_CA_FILE": "/opt/bitnami/openldap/share/openldap.crt",
|
||||
@@ -2883,11 +2882,11 @@ def ldapService():
|
||||
"ls -la /tmp/ldif-files/",
|
||||
"/tmp/custom-scripts/docker-entrypoint-override.sh /opt/bitnami/scripts/openldap/run.sh",
|
||||
],
|
||||
"backend_options": {
|
||||
"docker": {
|
||||
"user": "0:0",
|
||||
},
|
||||
},
|
||||
#"backend_options": {
|
||||
# "docker": {
|
||||
# "user": "0:0",
|
||||
# },
|
||||
#},
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user