Merge branch 'master' into 805-enable-tests-whenever-possible

.travis.yml

@@ -47,11 +47,11 @@ install:
  - cabal --version
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
  - travis_retry cabal update
- - cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0
+ - cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options="-O0 -Werror"
 
 script:
  - if [ -f configure.ac ]; then autoreconf -i; fi
- - cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options=-O0 # -v2 provides useful information for debugging
+ - cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options="-O0 -Werror" # -v2 provides useful information for debugging
  - cabal build   # this builds all libraries and executables (including tests/benchmarks)
  - cabal test
  - cabal check

ChangeLog.md

@@ -1,3 +1,7 @@
+## Unreleased changes
+
+* Added the `--docker-env` argument, to set environment variables in Docker container.
+
 ## 0.1.3.1
 
 Major changes:

src/Stack/Build/Execute.hs

@@ -250,7 +250,6 @@ getSetupExe setupHs tmpdir = do
             liftIO $ D.createDirectoryIfMissing True $ toFilePath setupDir
 
             menv <- getMinimalEnvOverride
-            wc <- getWhichCompiler
             let args =
                     [ "-clear-package-db"
                     , "-global-package-db"

src/Stack/Build/Source.hs

@@ -119,7 +119,22 @@ loadSourceMap needTargets bopts = do
 
         -- Overwrite any flag settings with those from the config file
         extraDeps3 = Map.mapWithKey
-            (\n (v, f) -> PSUpstream v Local $ fromMaybe f $ Map.lookup n $ bcFlags bconfig)
+            (\n (v, f) -> PSUpstream v Local $
+                case ( Map.lookup (Just n) $ boptsFlags bopts
+                     , Map.lookup Nothing $ boptsFlags bopts
+                     , Map.lookup n $ bcFlags bconfig
+                     ) of
+                    -- Didn't have any flag overrides, fall back to the flags
+                    -- defined in the snapshot.
+                    (Nothing, Nothing, Nothing) -> f
+                    -- Either command line flag for this package, general
+                    -- command line flag, or flag in stack.yaml is defined.
+                    -- Take all of those and ignore the snapshot flags.
+                    (x, y, z) -> Map.unions
+                        [ fromMaybe Map.empty x
+                        , fromMaybe Map.empty y
+                        , fromMaybe Map.empty z
+                        ])
             extraDeps2
 
     let sourceMap = Map.unions

src/Stack/Docker.hs

@@ -247,6 +247,7 @@ runContainerAndExit modConfig
          ,concatMap (\(k,v) -> ["-e", k ++ "=" ++ v]) envVars
          ,concatMap sandboxSubdirArg sandboxSubdirs
          ,concatMap mountArg (dockerMount docker)
+         ,concatMap (\nv -> ["-e", nv]) (dockerEnv docker)
          ,case dockerContainerName docker of
             Just name -> ["--name=" ++ name]
             Nothing -> []
@@ -677,6 +678,7 @@ dockerOptsFromMonoid mproject stackRoot DockerOptsMonoid{..} = DockerOpts
   ,dockerContainerName = emptyToNothing dockerMonoidContainerName
   ,dockerRunArgs = dockerMonoidRunArgs
   ,dockerMount = dockerMonoidMount
+  ,dockerEnv = dockerMonoidEnv
   ,dockerDatabasePath =
      case dockerMonoidDatabasePath of
        Nothing -> stackRoot </> $(mkRelFile "docker.db")

src/Stack/Ghci.hs

@@ -156,7 +156,12 @@ ghciSetup
     -> [Text]
     -> m (Map PackageName SimpleTarget, Maybe (Map PackageName SimpleTarget), [GhciPkgInfo])
 ghciSetup mainIs stringTargets = do
-    (_,_,targets) <- parseTargetsFromBuildOpts AllowNoTargets defaultBuildOpts
+    (_,_,targets) <-
+        parseTargetsFromBuildOpts
+            AllowNoTargets
+            defaultBuildOpts
+            { boptsTargets = stringTargets
+            }
     mainIsTargets <-
         case mainIs of
             Nothing -> return Nothing
@@ -187,7 +192,7 @@ ghciSetup mainIs stringTargets = do
         forM locals $
         \(name,(cabalfp,components)) ->
              makeGhciPkgInfo sourceMap (map fst locals) name cabalfp components
-    build (const (return ())) Nothing bopts
+    unless (M.null realTargets) (build (const (return ())) Nothing bopts)
     return (realTargets, mainIsTargets, infos)
   where
     makeBuildOpts targets =

src/Stack/Options.hs

@@ -319,7 +319,12 @@ dockerOptsParser showOptions =
                            hide <>
                            metavar "(PATH | HOST-PATH:CONTAINER-PATH)" <>
                            help ("Mount volumes from host in container " ++
-                                 "(may specify mutliple times)")))
+                                 "(may specify multiple times)")))
+    <*> many (option str (long (dockerOptName dockerEnvArgName) <>
+                                hide <>
+                                metavar "NAME=VALUE" <>
+                                help ("Set environment variable in container " ++
+                                      "(may specify multiple times)")))
     <*> maybeStrOption (long (dockerOptName dockerDatabasePathArgName) <>
                         hide <>
                         metavar "PATH" <>

src/Stack/Types/Docker.hs

@@ -36,6 +36,8 @@ data DockerOpts = DockerOpts
     -- ^ Arguments to pass directly to @docker run@.
   ,dockerMount :: ![Mount]
     -- ^ Volumes to mount in the container.
+  ,dockerEnv :: ![String]
+    -- ^ Environment variables to set in the container.
   ,dockerDatabasePath :: !(Path Abs File)
     -- ^ Location of image usage database.
   }
@@ -70,6 +72,8 @@ data DockerOptsMonoid = DockerOptsMonoid
     -- ^ Arguments to pass directly to @docker run@
   ,dockerMonoidMount :: ![Mount]
     -- ^ Volumes to mount in the container
+  ,dockerMonoidEnv :: ![String]
+    -- ^ Environment variables to set in the container
   ,dockerMonoidDatabasePath :: !(Maybe String)
     -- ^ Location of image usage database.
   }
@@ -92,6 +96,7 @@ instance FromJSON (DockerOptsMonoid, [JSONWarning]) where
               dockerMonoidContainerName    <- o ..:? dockerContainerNameArgName
               dockerMonoidRunArgs          <- o ..:? dockerRunArgsArgName ..!= []
               dockerMonoidMount            <- o ..:? dockerMountArgName ..!= []
+              dockerMonoidEnv              <- o ..:? dockerEnvArgName ..!= []
               dockerMonoidDatabasePath     <- o ..:? dockerDatabasePathArgName
               return DockerOptsMonoid{..})
 
@@ -110,6 +115,7 @@ instance Monoid DockerOptsMonoid where
     ,dockerMonoidContainerName    = Nothing
     ,dockerMonoidRunArgs          = []
     ,dockerMonoidMount            = []
+    ,dockerMonoidEnv              = []
     ,dockerMonoidDatabasePath     = Nothing
     }
   mappend l r = DockerOptsMonoid
@@ -125,6 +131,7 @@ instance Monoid DockerOptsMonoid where
     ,dockerMonoidContainerName    = dockerMonoidContainerName l <|> dockerMonoidContainerName r
     ,dockerMonoidRunArgs          = dockerMonoidRunArgs r <> dockerMonoidRunArgs l
     ,dockerMonoidMount            = dockerMonoidMount r <> dockerMonoidMount l
+    ,dockerMonoidEnv              = dockerMonoidEnv r <> dockerMonoidEnv l
     ,dockerMonoidDatabasePath     = dockerMonoidDatabasePath l <|> dockerMonoidDatabasePath r
     }
 
@@ -195,6 +202,10 @@ dockerRunArgsArgName = "run-args"
 dockerMountArgName :: Text
 dockerMountArgName = "mount"
 
+-- | Docker environment variable argument name.
+dockerEnvArgName :: Text
+dockerEnvArgName = "env"
+
 -- | Docker container name argument name.
 dockerContainerNameArgName :: Text
 dockerContainerNameArgName = "container-name"

src/main/Main.hs

@@ -32,6 +32,7 @@ import           Data.Text (Text)
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
 import           Data.Traversable
+import           Distribution.System (buildArch)
 import           Development.GitRev (gitCommitCount)
 import           Network.HTTP.Client
 import           Options.Applicative.Args
@@ -149,6 +150,7 @@ main = withInterpreterArgs stackProgName $ \args isInterpreter -> do
               -- Leave out number of commits for --depth=1 clone
               -- See https://github.com/commercialhaskell/stack/issues/792
             , [" (" ++ $gitCommitCount ++ " commits)" | $gitCommitCount /= ("1"::String)]
+            , [" ", show buildArch]
             ]
      eGlobalRun <- try $
        simpleOptions

stack.cabal

@@ -186,6 +186,7 @@ executable stack
 
   build-depends:  base >=4.7 && < 5
                 , bytestring >= 0.10.4.0
+                , Cabal
                 , containers
                 , exceptions
                 , filepath