Skip to content

Commit 30a10e9

Browse files
committed
mastercontainer: skip docker api version check if DOCKER_API_VERSION was set globally
Signed-off-by: Simon L. <[email protected]>
1 parent b80bc26 commit 30a10e9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Containers/mastercontainer/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ fi
116116

117117
# Docker api version check
118118
# shellcheck disable=SC2001
119-
API_VERSION_NUMB="$(echo "$API_VERSION" | sed 's/\.//')"
119+
API_VERSION_NUMB="$(echo "$DOCKER_API_VERSION" | sed 's/\.//')"
120120
LOCAL_API_VERSION_NUMB="$(sudo -E -u www-data docker version | grep -i "api version" | grep -oP '[0-9]+.[0-9]+' | head -1 | sed 's/\.//')"
121121
if [ -z "$LOCAL_API_VERSION_NUMB" ]; then
122122
LOCAL_API_VERSION_NUMB="$(sudo -E -u www-data DOCKER_API_VERSION="$FALLBACK_DOCKER_API_VERSION" docker version | grep -i "api version" | grep -oP '[0-9]+.[0-9]+' | head -1 | sed 's/\.//')"

0 commit comments

Comments
 (0)