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

bump containers bound; build against ghc 8.6.4

commitd56b8885788840268ee7187ac17b9e4c7acacb05 authorJP <jprider63@users.noreply.github.com> dateTue 21 May 2019, 21:46 (7 years ago) parenta52b484bc65660
5 files changed+11−3
compare with master
unifiedsplit
.travis.yml+4 docker.cabal+1−1 stack-8.6.4.yaml+4 stack.yaml+1−1 tests/tests.hs+1−1
.travis.yml+4
@@ -39,6 +39,10 @@ env:
3939 - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.0.2
4040 - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.0.2
4141
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+
4246addons:
4347 apt:
4448 packages:
docker.cabal+1−1
@@ -28,7 +28,7 @@ library
2828 , aeson >= 0.9.0 && < 2.0.0
2929 , blaze-builder >= 0.4.0 && < 0.5.0
3030 , bytestring >= 0.10.0 && < 0.11.0
31− , containers >= 0.5.0 && < 0.6.0
31+ , containers >= 0.5.0 && < 0.7.0
3232 , data-default-class >= 0.0.1 && < 0.2.0
3333 , http-client >= 0.4.0 && < 0.6.0
3434 , 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 =
7676
7777testDeleteImage :: IO ()
7878testDeleteImage = runDocker $ do
79− (Just img) <- findTestImage
79+ img <- fmap fromJust findTestImage
8080 result <- deleteImage defaultImageDeleteOpts (imageId img)
8181 lift $ assert $ isRight result
8282 maybeTestImageAfter <- findTestImage