Compare commits

...

7 Commits

Author SHA1 Message Date
Viktor Scharf
8d18aa00b9 fix 2025-08-11 15:25:32 +02:00
Viktor Scharf
2b87df8daf fix 2025-08-11 15:21:18 +02:00
Viktor Scharf
5f30c4a987 fix 2025-08-11 15:19:15 +02:00
Viktor Scharf
a3586358ca fix 2025-08-11 15:06:59 +02:00
Viktor Scharf
4d973d037a fix 2025-08-11 14:45:17 +02:00
Viktor Scharf
39d8373122 trigger ci 2025-08-11 14:33:10 +02:00
Viktor Scharf
0a0ad56d6a run ldap as services 2025-08-11 14:31:28 +02:00

View File

@@ -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",
# },
#},
},
]