git.iko.soy/docker-hs
on master help sign in
Merge pull request #67 from backuitist/master
d56b888JP
.travis.yml+4
compare with master
unifiedsplit
@@ -39,6 +39,10 @@ env:
39 - DOCKER_VERSION="1.13.1-0~ubuntu-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
40 - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.0.2
41
41
42+ - DOCKER_VERSION="1.12.3-0~trusty" GHCVER=8.6.4
43+ - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.6.4
44+ - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.6.4
45+
42addons:
46addons:
43 apt:
47 apt:
44 packages:
48 packages:
docker.cabal+1−1
@@ -28,7 +28,7 @@ library
28 , aeson >= 0.9.0 && < 2.0.0
28 , aeson >= 0.9.0 && < 2.0.0
29 , blaze-builder >= 0.4.0 && < 0.5.0
29 , blaze-builder >= 0.4.0 && < 0.5.0
30 , bytestring >= 0.10.0 && < 0.11.0
30 , bytestring >= 0.10.0 && < 0.11.0
31− , containers >= 0.5.0 && < 0.6.0
31+ , containers >= 0.5.0 && < 0.7.0
32 , data-default-class >= 0.0.1 && < 0.2.0
32 , data-default-class >= 0.0.1 && < 0.2.0
33 , http-client >= 0.4.0 && < 0.6.0
33 , http-client >= 0.4.0 && < 0.6.0
34 , http-types >= 0.9 && < 0.13
34 , http-types >= 0.9 && < 0.13
stack-8.6.4.yamlnew file+4
@@ -0,0 +1,4 @@
1+resolver: lts-13.19
2+packages:
3+- '.'
4+extra-deps: []
stack.yaml+1−1
@@ -1 +1 @@
1−stack-8.0.2.yaml
1+stack-8.6.4.yaml
tests/tests.hs+1−1
@@ -76,7 +76,7 @@ testFindImage =
76
76
77testDeleteImage :: IO ()
77testDeleteImage :: IO ()
78testDeleteImage = runDocker $ do
78testDeleteImage = runDocker $ do
79− (Just img) <- findTestImage
79+ img <- fmap fromJust findTestImage
80 result <- deleteImage defaultImageDeleteOpts (imageId img)
80 result <- deleteImage defaultImageDeleteOpts (imageId img)
81 lift $ assert $ isRight result
81 lift $ assert $ isRight result
82 maybeTestImageAfter <- findTestImage
82 maybeTestImageAfter <- findTestImage