diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f40b2582..f79c4ce2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -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"] diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index c642ab15..179c0a76 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -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 diff --git a/Containers/mastercontainer/start.sh b/Containers/mastercontainer/start.sh index 8e2bbcda..243287ea 100644 --- a/Containers/mastercontainer/start.sh +++ b/Containers/mastercontainer/start.sh @@ -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"