Skip to content

Commit

Permalink
Mender changed version numbers to drop -ce/-ee (see: docker/docker-ce…
Browse files Browse the repository at this point in the history
…-packaging#206) so we should just check to see if we're on version >2.x.x
  • Loading branch information
jgitlin-bt committed Nov 12, 2018
1 parent 4f09a48 commit e93ed50
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion verify-docker-versions
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit e93ed50

Please sign in to comment.