d8c2084 · docker-hs · git.iko.soy

.travis.yml+17−4

compare with master

unifiedsplit

@@ -22,9 +22,22 @@ services:

22 - docker

23

24env:

25+ global:

25− - RUN_INTEGRATION_TESTS=1 GHCVER=7.10 STACK_ARGS=""

26+ - RUN_INTEGRATION_TESTS=1

26− - RUN_INTEGRATION_TESTS=1 GHCVER=8.0 STACK_ARGS=""

27+ - STACK_ARGS=""

27− - RUN_INTEGRATION_TESTS=1 GHCVER=8.0.2 STACK_ARGS=""

28+

29+ matrix:

30+ - DOCKER_VERSION="1.12.3-0~trusty" GHCVER=7.10

31+ - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=7.10

32+ - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=7.10

33+

34+ - DOCKER_VERSION="1.12.3-0~trusty" GHCVER=8.0

35+ - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.0

36+ - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.0

37+

38+ - DOCKER_VERSION="1.12.3-0~trusty" GHCVER=8.0.2

39+ - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.0.2

40+ - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.0.2

28

41

29addons:

42addons:

30 apt:

43 apt:

@@ -36,7 +49,7 @@ before_install:

36 - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list'

49 - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list'

37 - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D

50 - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D

38 - sudo apt-get update

51 - sudo apt-get update

39− - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=1.12.3-0~trusty

52+ - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=$DOCKER_VERSION

40

53

41install:

54install:

42 - mkdir -p "$HOME"/.local/bin

55 - mkdir -p "$HOME"/.local/bin

src/Docker/Client/Types.hs+2−2

@@ -519,8 +519,8 @@ data Container = Container

519 } deriving (Show, Eq)

520

521instance FromJSON Container where

522− parseJSON (JSON.Object v) =

522+ parseJSON o@(JSON.Object v) =

523− Container <$> (v .: "Id")

523+ Container <$> (parseJSON o)

524 <*> (v .: "Names")

525 <*> (v .: "Image")

526 <*> (v .: "ImageID")

tests/Dockerfile+1−1

@@ -1,4 +1,4 @@

1FROM debian:jessie

2

3−CMD ["/bin/bash", "-c", "echo 123"]

3+CMD ["/bin/bash", "-c", "echo $TEST"]

4

tests/tests.hs+2−1

@@ -80,7 +80,8 @@ testBuildFromDockerfile = do

80testRunAndReadLog :: IO ()

81testRunAndReadLog =

82 runDocker $

83− do containerId <- createContainer (defaultCreateOpts (testImageName <> ":latest")) Nothing

83+ do let containerConfig = (defaultContainerConfig (testImageName <> ":latest")) {env = [EnvVar "TEST" "123"]}

84+ containerId <- createContainer (CreateOpts containerConfig defaultHostConfig) Nothing

84 c <- fromRight containerId

85 c <- fromRight containerId

85 status1 <- startContainer defaultStartOpts c

86 status1 <- startContainer defaultStartOpts c

86 _ <- inspectContainer c >>= fromRight

87 _ <- inspectContainer c >>= fromRight