mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-05-22 19:30:11 +00:00
Compare commits
1 Commits
v13.0.4
...
copilot/de
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1928b0a3f3 |
@@ -31,5 +31,4 @@ LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||
org.opencontainers.image.source="https://github.com/nextcloud/all-in-one" \
|
||||
org.opencontainers.image.vendor="Nextcloud" \
|
||||
org.opencontainers.image.documentation="https://github.com/nextcloud/all-in-one/blob/main/readme.md"
|
||||
ENV BORG_RETENTION_POLICY="--keep-within=7d --keep-weekly=4 --keep-monthly=6" \
|
||||
AIO_LOG_LEVEL="warn"
|
||||
ENV BORG_RETENTION_POLICY="--keep-within=7d --keep-weekly=4 --keep-monthly=6"
|
||||
|
||||
@@ -22,8 +22,6 @@ COPY --chmod=775 start.sh /start.sh
|
||||
# hadolint ignore=DL3002
|
||||
USER root
|
||||
|
||||
ENV AIO_LOG_LEVEL="warn"
|
||||
|
||||
ENTRYPOINT ["/start.sh"]
|
||||
LABEL com.centurylinklabs.watchtower.enable="false" \
|
||||
wud.watch="false" \
|
||||
|
||||
@@ -258,6 +258,16 @@ 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
|
||||
|
||||
@@ -1 +1 @@
|
||||
13.0.4
|
||||
13.0.3
|
||||
|
||||
Reference in New Issue
Block a user