From 67a89d6788e0c1bcf96477f543ec3f856a644260 Mon Sep 17 00:00:00 2001
From: zhang_xubo <2578876417@qq.com>
Date: Thu, 27 Jul 2023 19:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddocker=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/dockerfiles/buildDockerImage.sh | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/docker/dockerfiles/buildDockerImage.sh b/docker/dockerfiles/buildDockerImage.sh
index 9c8b84cb8..3cdcc067f 100644
--- a/docker/dockerfiles/buildDockerImage.sh
+++ b/docker/dockerfiles/buildDockerImage.sh
@@ -67,16 +67,16 @@ check_docker_version() {
   echo "Checking Docker version."
   DOCKER_VERSION=$(docker version --format '{{.Server.Version | printf "%.5s" }}'|| exit 0)
   # Remove dot in Docker version
-  DOCKER_VERSION=${DOCKER_VERSION//./}
+  docker_version_major=$(echo $DOCKER_VERSION | awk -F . '{print $1}')
 
   if [ -z "$DOCKER_VERSION" ]; then
     # docker could be aliased to podman and errored out (https://github.com/containers/libpod/pull/4608)
-    checkPodmanVersion
-  elif [ "$DOCKER_VERSION" -lt "${MIN_DOCKER_VERSION//./}" ]; then
-    echo "Docker version is below the minimum required version $MIN_DOCKER_VERSION"
+    echo "Please check if docker is installed." && exit 1
+  elif [ "$docker_version_major" -lt "${MIN_DOCKER_VERSION_MAJOR}" ]; then
+    echo "Docker version is below the minimum required version $MIN_DOCKER_VERSION_MAJOR.$MIN_DOCKER_VERSION_MINOR"
     echo "Please upgrade your Docker installation to proceed."
     exit 1;
-  fi;
+  fi
 }
 
 ##############
@@ -87,7 +87,8 @@ check_docker_version() {
 VERSION="5.0.0"
 SKIPCHECKSUM=0
 DOCKEROPS=""
-MIN_DOCKER_VERSION="17.09"
+MIN_DOCKER_VERSION_MAJOR="17"
+MIN_DOCKER_VERSION_MINOR="09"
 arch=$(case $(uname -m) in i386)   echo "386" ;; i686)   echo "386" ;; x86_64) echo "amd64";; aarch64)echo "arm64";; esac)
 if [ "${arch}" = "amd64" ]; then
     DOCKERFILE="dockerfile_amd"
@@ -129,12 +130,6 @@ done
 check_docker_version
 
 
-
-# Which Dockerfile should be used?
-if [ "$VERSION" == "12.1.0.2" ] || [ "$VERSION" == "11.2.0.2" ] || [ "$VERSION" == "18.4.0" ]; then
-  DOCKERFILE="$DOCKERFILE"
-fi;
-
 # openGauss Database Image Name
 IMAGE_NAME="opengauss:$VERSION"