Merge branch 'dev' into main

Websoft9 · Jan 3, 2025 · e185e56 · e185e56
2 parents 3e70be3 + 9b04104
commit e185e56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/install/install_docker.sh b/install/install_docker.sh
@@ -106,6 +106,13 @@ install_docker_custom() {
       sudo mkdir -p /usr/local/lib/docker/cli-plugins/
       sudo curl -SL "https://github.com/docker/compose/releases/latest/download/docker-compose-linux-$(uname -m)" -o /usr/local/lib/docker/cli-plugins/docker-compose
       sudo chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
+    elif [ "$lsb_dist" = "openeuler" ]; then
+      sudo dnf update -y
+      sudo dnf -y install dnf-plugins-core
+      sudo dnf config-manager --add-repo=https://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo
+      sudo sed -i 's+$releasever+8+'  /etc/yum.repos.d/docker-ce.repo
+      sudo dnf makecache
+      sudo dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
     else
       repos=("${repos_base[@]/%//${lsb_dist}/docker-ce.repo}")
       sudo dnf remove -y podman || sudo yum remove -y podman
@@ -204,4 +211,4 @@ command_exists() {
 download_docker_script
 
 # install docker
-install_docker_official
+install_docker_official
diff --git a/version.json b/version.json
@@ -11,8 +11,8 @@
   },
   "OS": {
     "Fedora": [
-      "41",
-      "40"
+      "40",
+      "39"
     ],
     "RedHat": [
       "9",
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,8 +11,8 @@ @@
       },
       "OS": {
         "Fedora": [
-          "41",
-          "40"
+          "40",
+          "39"
         ],
         "RedHat": [
           "9",
@@ Expand Down @@