git.iko.soy/docker-hs
on master help sign in
Merge pull request #50 from jprider63/master

Adds different versions of Docker to test against

commitd8c208460b7675d29b06312cd3364b26b64bf639 authorDeni Bertovic <deni@denibertovic.com> dateTue 9 Jan 2018, 00:18 (9 years ago) parentea7f6b075d2c53
4 files changed+22−8
compare with master
unifiedsplit
.travis.yml+17−4 src/Docker/Client/Types.hs+2−2 tests/Dockerfile+1−1 tests/tests.hs+2−1
.travis.yml+17−4
@@ -22,9 +22,22 @@ services:
2222 - docker
2323
2424env:
25− - RUN_INTEGRATION_TESTS=1 GHCVER=7.10 STACK_ARGS=""
26− - RUN_INTEGRATION_TESTS=1 GHCVER=8.0 STACK_ARGS=""
27− - RUN_INTEGRATION_TESTS=1 GHCVER=8.0.2 STACK_ARGS=""
25+ global:
26+ - RUN_INTEGRATION_TESTS=1
27+ - 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
2841
2942addons:
3043 apt:
@@ -36,7 +49,7 @@ before_install:
3649 - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list'
3750 - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
3851 - 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
4053
4154install:
4255 - mkdir -p "$HOME"/.local/bin
src/Docker/Client/Types.hs+2−2
@@ -519,8 +519,8 @@ data Container = Container
519519 } deriving (Show, Eq)
520520
521521instance FromJSON Container where
522− parseJSON (JSON.Object v) =
523− Container <$> (v .: "Id")
522+ parseJSON o@(JSON.Object v) =
523+ Container <$> (parseJSON o)
524524 <*> (v .: "Names")
525525 <*> (v .: "Image")
526526 <*> (v .: "ImageID")
tests/Dockerfile+1−1
@@ -1,4 +1,4 @@
11FROM debian:jessie
22
3−CMD ["/bin/bash", "-c", "echo 123"]
3+CMD ["/bin/bash", "-c", "echo $TEST"]
44
tests/tests.hs+2−1
@@ -80,7 +80,8 @@ testBuildFromDockerfile = do
8080testRunAndReadLog :: IO ()
8181testRunAndReadLog =
8282 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
8485 c <- fromRight containerId
8586 status1 <- startContainer defaultStartOpts c
8687 _ <- inspectContainer c >>= fromRight