Skip to content

Commit 71befc3

Browse files
authored
Merge pull request #2115 from zuohuadong/canary
feat: fix OpencloudOS setup
2 parents bca32f0 + f9972be commit 71befc3

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

packages/server/src/setup/server-setup.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,14 +419,26 @@ if ! [ -x "$(command -v docker)" ]; then
419419
systemctl enable docker >/dev/null 2>&1
420420
;;
421421
"opencloudos")
422-
dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo >/dev/null 2>&1
423-
dnf install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin >/dev/null 2>&1
422+
# Special handling for OpenCloud OS
423+
echo " - Installing Docker for OpenCloud OS..."
424+
dnf install -y docker >/dev/null 2>&1
424425
if ! [ -x "$(command -v docker)" ]; then
425426
echo " - Docker could not be installed automatically. Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
426427
exit 1
427428
fi
428-
systemctl start docker >/dev/null 2>&1
429+
430+
# Remove --live-restore parameter from Docker configuration if it exists
431+
if [ -f "/etc/sysconfig/docker" ]; then
432+
echo " - Removing --live-restore parameter from Docker configuration..."
433+
sed -i 's/--live-restore[^[:space:]]*//' /etc/sysconfig/docker >/dev/null 2>&1
434+
sed -i 's/--live-restore//' /etc/sysconfig/docker >/dev/null 2>&1
435+
# Clean up any double spaces that might be left
436+
sed -i 's/ */ /g' /etc/sysconfig/docker >/dev/null 2>&1
437+
fi
438+
429439
systemctl enable docker >/dev/null 2>&1
440+
systemctl start docker >/dev/null 2>&1
441+
echo " - Docker configured for OpenCloud OS"
430442
;;
431443
"alpine")
432444
apk add docker docker-cli-compose >/dev/null 2>&1

0 commit comments

Comments
 (0)