Docker: strip suffix from docker --version

fixes #1653
commercialhaskell · Jan 30, 2016 · 8ca93bb · 8ca93bb
1 parent 0200591
commit 8ca93bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -22,6 +22,8 @@ Other enhancements:
 
 * Docker: pass ~/.ssh and SSH auth socket into container, so that git repos
   work [#1358](https://github.com/commercialhaskell/stack/issues/1358)
+* Docker: strip suffix from docker --version
+  [#1653](https://github.com/commercialhaskell/stack/issues/1653)
 
 Bug fixes:
 

diff --git a/src/Stack/Docker.hs b/src/Stack/Docker.hs
@@ -697,7 +697,7 @@ checkDockerVersion envOverride docker =
      dockerVersionOut <- readDockerProcess envOverride ["--version"]
      case words (decodeUtf8 dockerVersionOut) of
        (_:_:v:_) ->
-         case parseVersionFromString (dropWhileEnd (not . isDigit) v) of
+         case parseVersionFromString (stripVersion v) of
            Just v'
              | v' < minimumDockerVersion ->
                throwM (DockerTooOldException minimumDockerVersion v')
@@ -711,6 +711,7 @@ checkDockerVersion envOverride docker =
        _ -> throwM InvalidVersionOutputException
   where minimumDockerVersion = $(mkVersion "1.6.0")
         prohibitedDockerVersions = []
+        stripVersion v = fst $ break (== '-') $ dropWhileEnd (not . isDigit) v
 
 -- | Remove the project's Docker sandbox.
 reset :: (MonadIO m, MonadReader env m, HasConfig env)