From d543fd5f3cd45e9f11809c8dbf9a849e4de749ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= Date: Tue, 6 Feb 2024 13:53:18 +0100 Subject: [PATCH] Remove +dfsg* from docker version On some Debian installations, the following command docker version --format '{{.Server.Version}}' returns a version number with +dfsg... added, for example: 20.10.5+dfsg1 After removing the dots, the comparison of DOCKER_VERSION with MIN_DOCKER_VERSION throws ./buildContainerImage.sh: line 97: [: 20105+dfsg1: integer expression expected This pull request also adds the substring +dfsg* from the version number in order for the comparison to have numerical values on both sides. --- .../SingleInstance/dockerfiles/buildContainerImage.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OracleDatabase/SingleInstance/dockerfiles/buildContainerImage.sh b/OracleDatabase/SingleInstance/dockerfiles/buildContainerImage.sh index 0239f69860..d4cbd02ec5 100755 --- a/OracleDatabase/SingleInstance/dockerfiles/buildContainerImage.sh +++ b/OracleDatabase/SingleInstance/dockerfiles/buildContainerImage.sh @@ -91,6 +91,8 @@ checkDockerVersion() { # Get Docker Server version echo "Checking Docker version." DOCKER_VERSION=$("${CONTAINER_RUNTIME}" version --format '{{.Server.Version }}'|| exit 0) + # Remove +dfsg* if present + DOCKER_VERSION=${DOCKER_VERSION%%+dfsg*} # Remove dot in Docker version DOCKER_VERSION=${DOCKER_VERSION//./}