Revert "downgrade internal docker to fix incompatibility with synology DSM"

This commit is contained in:
Simon L. 2025-11-20 16:02:34 +01:00 committed by GitHub
parent 5c2321a676
commit 52244a247e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 5 deletions

View file

@ -58,5 +58,3 @@ updates:
update-types: ["version-update:semver-major"]
- dependency-name: "elasticsearch"
update-types: ["version-update:semver-major"]
- dependency-name: "docker"
update-types: ["version-update:semver-major"]

View file

@ -1,7 +1,6 @@
# syntax=docker/dockerfile:latest
# Docker CLI is a requirement
# Needs to stay on v28 for now until Synology upgrades their docker version to at least v25
FROM docker:28.5.2-cli AS docker
FROM docker:29.0.2-cli AS docker
# Caddy is a requirement
FROM caddy:2.10.2-alpine AS caddy

View file

@ -76,7 +76,7 @@ elif ! sudo -u www-data test -r /var/run/docker.sock; then
fi
# Check if api version is supported
if ! sudo -u www-data docker info >/dev/null; then
if ! sudo -u www-data docker info &>/dev/null; then
print_red "Cannot connect to the docker socket. Cannot proceed."
echo "Did you maybe remove group read permissions for the docker socket? AIO needs them in order to access the docker socket."
echo "If SELinux is enabled on your host, see https://github.com/nextcloud/all-in-one#are-there-known-problems-when-selinux-is-enabled"