mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-07 12:50:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #594 from opencloud-eu/fixUsingWrapper

Browse Source 
[full-ci] only use wrapper when requested
This commit is contained in:
Artur Neumann
2025-04-08 13:13:53 +05:45
committed by GitHub
parent 58671abc6a 077c3c0268
commit 56753d5c46
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.woodpecker.star
View File

@@ -2071,11 +2071,18 @@ def opencloudServer(storage = "decomposed", accounts_hash_difficulty = 4, depend
for item in extra_server_environment:
environment[item] = extra_server_environment[item]
wrapper_commands = [
"make -C %s build" % dirs["ocWrapper"],
server_commands = [
"env | sort",
"%s/bin/ocwrapper serve --bin %s --url %s --admin-username admin --admin-password admin" % (dirs["ocWrapper"], dirs["opencloudBin"], environment["OC_URL"]),
]
if with_wrapper:
server_commands += [
"make -C %s build" % dirs["ocWrapper"],
"%s/bin/ocwrapper serve --bin %s --url %s --admin-username admin --admin-password admin" % (dirs["ocWrapper"], dirs["opencloudBin"], environment["OC_URL"]),
]
else:
server_commands += [
"%s server" % dirs["opencloudBin"],
]
wait_for_opencloud = {
"name": "wait-for-%s" % container_name,
@@ -2102,7 +2109,7 @@ def opencloudServer(storage = "decomposed", accounts_hash_difficulty = 4, depend
"%s init --insecure true" % dirs["opencloudBin"],
"cat $OC_CONFIG_DIR/opencloud.yaml",
"cp tests/config/woodpecker/app-registry.yaml $OC_CONFIG_DIR/app-registry.yaml",
] + wrapper_commands,
] + server_commands,
}
steps = [