eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

downgrade docker to fix incompatibility with synology DSM

Browse source 
Signed-off-by: Simon L. <szaimen@e.mail.de>
This commit is contained in:
Simon L. 2025-11-20 15:50:00 +01:00
parent 299c9eeb1c
commit 3b60861189
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/dependabot.yml vendored
View file

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

3
Containers/mastercontainer/Dockerfile
View file

@ -1,6 +1,7 @@
# syntax=docker/dockerfile:latest # syntax=docker/dockerfile:latest
# Docker CLI is a requirement # Docker CLI is a requirement
FROM docker:29.0.2-cli AS docker # 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
# Caddy is a requirement # Caddy is a requirement
FROM caddy:2.10.2-alpine AS caddy FROM caddy:2.10.2-alpine AS caddy

2
Containers/mastercontainer/start.sh
View file

@ -76,7 +76,7 @@ elif ! sudo -u www-data test -r /var/run/docker.sock; then
fi fi
# Check if api version is supported # 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." 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 "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" echo "If SELinux is enabled on your host, see https://github.com/nextcloud/all-in-one#are-there-known-problems-when-selinux-is-enabled"