mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-05-21 10:50:10 +00:00
Compare commits
1 Commits
copilot/de
...
copilot/de
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9777ea940a |
@@ -9,6 +9,7 @@ POSTGRES_LOG_MIN_MESSAGES="$(case "$AIO_LOG_LEVEL" in
|
||||
info) printf 'info' ;;
|
||||
warn) printf 'warning' ;;
|
||||
error) printf 'error' ;;
|
||||
*) printf 'warning' ;;
|
||||
esac)"
|
||||
export POSTGRES_LOG_MIN_MESSAGES
|
||||
|
||||
|
||||
@@ -9,8 +9,10 @@ if [ "$AIO_LOG_LEVEL" = "warn" ] || [ "$AIO_LOG_LEVEL" = "error" ]; then
|
||||
REDIS_LOG_LEVEL="warning"
|
||||
elif [ "$AIO_LOG_LEVEL" = "info" ]; then
|
||||
REDIS_LOG_LEVEL="notice"
|
||||
elif [ "$AIO_LOG_LEVEL" = "debug" ]; then
|
||||
REDIS_LOG_LEVEL="debug"
|
||||
else
|
||||
REDIS_LOG_LEVEL="$AIO_LOG_LEVEL"
|
||||
REDIS_LOG_LEVEL="warning"
|
||||
fi
|
||||
export REDIS_LOG_LEVEL
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ if [ -f /run/.containerenv ]; then
|
||||
fi
|
||||
|
||||
if [ -n "$CONTAINER_TO_UPDATE" ]; then
|
||||
exec /watchtower --cleanup --log-level "$AIO_LOG_LEVEL" --run-once "$CONTAINER_TO_UPDATE"
|
||||
exec /watchtower --cleanup --log-level "${AIO_LOG_LEVEL:-warn}" --run-once "$CONTAINER_TO_UPDATE"
|
||||
else
|
||||
echo "'CONTAINER_TO_UPDATE' is not set. Cannot update anything."
|
||||
exit 1
|
||||
|
||||
@@ -258,16 +258,6 @@ readonly class DockerController {
|
||||
}
|
||||
|
||||
public function startTopContainer(bool $pullImage, ?\Closure $addToStreamingResponseBody = null) : void {
|
||||
if ($pullImage && $this->dockerActionManager->IsMastercontainerUpdateAvailable()) {
|
||||
// The mastercontainer must always be updated before the sibling containers.
|
||||
// If a mastercontainer update is still available at this point it means we are likely
|
||||
// running inside the old mastercontainer during its Docker stop grace period while
|
||||
// watchtower has already started the new mastercontainer. Skip the update here —
|
||||
// the new mastercontainer will re-run this process and perform the update correctly.
|
||||
error_log('Not updating sibling containers because a mastercontainer update is available. The mastercontainer must be updated first.');
|
||||
return;
|
||||
}
|
||||
|
||||
$this->configurationManager->aioToken = bin2hex(random_bytes(24));
|
||||
|
||||
// Stop domaincheck since apache would not be able to start otherwise
|
||||
|
||||
Reference in New Issue
Block a user