Mender changed version numbers to drop -ce/-ee (see: docker/docker-ce…

…-packaging#206) so we should just check to see if we're on version >2.x.x Changelog: Fix docker version detection Signed-off-by: Josh Gitlin <[email protected]>
mendersoftware · Nov 13, 2018 · a24f3a2 · a24f3a2
1 parent 4f09a48
commit a24f3a2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/verify-docker-versions b/verify-docker-versions
@@ -29,7 +29,7 @@ compare_versions() {
 
 DOCKER_ENGINE_VERSION_STRING=$(sudo docker info 2>/dev/null | grep "Server Version")
 
-DOCKER_ENGINE_VERSION_NEW_SCHEME_REGEX="Server Version: [0-9]+\.[0-9]+\.[0-9]+-[ce]e"
+DOCKER_ENGINE_VERSION_NEW_SCHEME_REGEX="Server Version: ([0-9]{2,})|([2-9]+)\.[0-9]+\.[0-9]+"
 
 if [[ $DOCKER_ENGINE_VERSION_STRING =~ $DOCKER_ENGINE_VERSION_NEW_SCHEME_REGEX ]]; then