Enable docker-auto-pull by default (fixes #3332)

commercialhaskell · Mar 27, 2019 · be2b9c6 · be2b9c6
1 parent f0b66a1
commit be2b9c6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -256,6 +256,8 @@ Behavior changes:
   download a template, stack will check whether that template had
   been downloaded before. In that case, the cached version will be
   used. See [#3850](https://github.com/commercialhaskell/stack/issues/3850).
+* The new default for `--docker-auto-pull` is enabled. See
+  [#3332](https://github.com/commercialhaskell/stack/issues/3332).
 
 Other enhancements:
 

diff --git a/src/Stack/Config/Docker.hs b/src/Stack/Config/Docker.hs
@@ -69,7 +69,7 @@ dockerOptsFromMonoid mproject stackRoot maresolver DockerOptsMonoid{..} = do
                 dockerMonoidRegistryLogin
         dockerRegistryUsername = emptyToNothing (getFirst dockerMonoidRegistryUsername)
         dockerRegistryPassword = emptyToNothing (getFirst dockerMonoidRegistryPassword)
-        dockerAutoPull = fromFirstFalse dockerMonoidAutoPull
+        dockerAutoPull = fromFirstTrue dockerMonoidAutoPull
         dockerDetach = fromFirstFalse dockerMonoidDetach
         dockerPersist = fromFirstFalse dockerMonoidPersist
         dockerContainerName = emptyToNothing (getFirst dockerMonoidContainerName)

diff --git a/src/Stack/Options/DockerParser.hs b/src/Stack/Options/DockerParser.hs
@@ -46,7 +46,7 @@ dockerOptsParser hide0 =
                         hide <>
                         metavar "PASSWORD" <>
                         help "Docker registry password")
-    <*> firstBoolFlagsFalse
+    <*> firstBoolFlagsTrue
                        (dockerOptName dockerAutoPullArgName)
                        "automatic pulling latest version of image"
                        hide

diff --git a/src/Stack/Types/Docker.hs b/src/Stack/Types/Docker.hs
@@ -75,7 +75,7 @@ data DockerOptsMonoid = DockerOptsMonoid
     -- ^ Optional username for Docker registry.
   ,dockerMonoidRegistryPassword :: !(First String)
     -- ^ Optional password for Docker registry.
-  ,dockerMonoidAutoPull :: !FirstFalse
+  ,dockerMonoidAutoPull :: !FirstTrue
     -- ^ Automatically pull new images.
   ,dockerMonoidDetach :: !FirstFalse
     -- ^ Whether to run a detached container
@@ -114,7 +114,7 @@ instance FromJSON (WithJSONWarnings DockerOptsMonoid) where
               dockerMonoidRegistryLogin    <- First <$> o ..:? dockerRegistryLoginArgName
               dockerMonoidRegistryUsername <- First <$> o ..:? dockerRegistryUsernameArgName
               dockerMonoidRegistryPassword <- First <$> o ..:? dockerRegistryPasswordArgName
-              dockerMonoidAutoPull         <- FirstFalse <$> o ..:? dockerAutoPullArgName
+              dockerMonoidAutoPull         <- FirstTrue <$> o ..:? dockerAutoPullArgName
               dockerMonoidDetach           <- FirstFalse <$> o ..:? dockerDetachArgName
               dockerMonoidPersist          <- FirstFalse <$> o ..:? dockerPersistArgName
               dockerMonoidContainerName    <- First <$> o ..:? dockerContainerNameArgName