git.iko.soy/docker-hs
on d44ca8b help sign in
9009766
swap
0 ahead, 15 behind
.travis.yml−8
since splitsnapshots
unifiedsplit
@@ -39,14 +39,6 @@ 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−
46− - DOCKER_VERSION="1.12.3-0~trusty" GHCVER=8.8.2
47− - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.8.2
48− - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.8.2
49−
50addons:
42addons:
51 apt:
43 apt:
52 packages:
44 packages:
CHANGELOG.md−19
@@ -1,24 +1,5 @@
1# CHANGELOG
1# CHANGELOG
2
2
3−## 0.6.0.3 (2020-02-17)
4−
5−- Support for ghc 8.8.2.
6−- Bump dependency version.
7−- Use MonadFail for later versions.
8−
9−## 0.6.0.1 (2019-05-23)
10−
11−- Support ghc 8.6.4.
12−- Bump containers version.
13−
14−## 0.6.0.0 (2018-06-28)
15−
16−- Rename DeleteOpts to ContainerDeleteOpts.
17−- Implement image deletion.
18−- Bump aeson version.
19−- Implement network aliases.
20−- Implement creating/deleting networks.
21−
22## 0.5.1.1 (2018-03-09)
3## 0.5.1.1 (2018-03-09)
23
4
24- Bump aeson version.
5- Bump aeson version.
docker.cabal+6−6
@@ -1,5 +1,5 @@
1name: docker
1name: docker
2−version: 0.6.0.3
2+version: 0.5.1.1
3synopsis: An API client for docker written in Haskell
3synopsis: An API client for docker written in Haskell
4description: See API documentation below.
4description: See API documentation below.
5homepage: https://github.com/denibertovic/docker-hs
5homepage: https://github.com/denibertovic/docker-hs
@@ -25,12 +25,12 @@ library
25 exposed-modules: Docker.Client, Docker.Client.Api, Docker.Client.Types, Docker.Client.Internal, Docker.Client.Http, Docker.Client.Utils
25 exposed-modules: Docker.Client, Docker.Client.Api, Docker.Client.Types, Docker.Client.Internal, Docker.Client.Http, Docker.Client.Utils
26 -- other-modules: Docker.Internal
26 -- other-modules: Docker.Internal
27 build-depends: base >= 4.7 && < 5
27 build-depends: base >= 4.7 && < 5
28− , aeson >= 0.9.0 && < 2.0.0
28+ , aeson >= 0.9.0 && < 1.4.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.7.0
31+ , containers >= 0.5.0 && < 0.6.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.7.0
33+ , http-client >= 0.4.0 && < 0.6.0
34 , http-types >= 0.9 && < 0.13
34 , http-types >= 0.9 && < 0.13
35 , vector
35 , vector
36 , conduit
36 , conduit
@@ -51,9 +51,9 @@ library
51 , mtl >= 2.0.0 && < 3.0.0
51 , mtl >= 2.0.0 && < 3.0.0
52 , network >= 2.6.0
52 , network >= 2.6.0
53 , text >= 1.0.0 && < 2.0.0
53 , text >= 1.0.0 && < 2.0.0
54− , time >= 1.5.0 && < 2.0.0
54+ , time >= 1.5.0 && < 1.9.0
55 , scientific >= 0.3.0 && < 0.4.0
55 , scientific >= 0.3.0 && < 0.4.0
56− , tls >= 1.3.7 && < 1.6.0
56+ , tls >= 1.3.7 && < 1.5.0
57 , unordered-containers >= 0.2.0 && < 0.3.0
57 , unordered-containers >= 0.2.0 && < 0.3.0
58 , x509 >= 1.6.0 && < 1.8.0
58 , x509 >= 1.6.0 && < 1.8.0
59 , x509-store >= 1.6.0 && < 1.8.0
59 , x509-store >= 1.6.0 && < 1.8.0
src/Docker/Client/Types.hs−4
@@ -1564,11 +1564,7 @@ instance FromJSON ContainerConfig where
1564 macAddress labels stopSignal
1564 macAddress labels stopSignal
1565 parseJSON _ = fail "NetworkSettings is not an object."
1565 parseJSON _ = fail "NetworkSettings is not an object."
1566
1566
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
1570parseIntegerText :: (Monad m) => Text -> m Integer
1567parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
1572parseIntegerText t = case readMaybe $ T.unpack t of
1568parseIntegerText t = case readMaybe $ T.unpack t of
1573 Nothing ->
1569 Nothing ->
1574 fail "Could not parse Integer"
1570 fail "Could not parse Integer"
stack-7.10.yaml−1
@@ -14,7 +14,6 @@ flags: {}
14extra-deps:
14extra-deps:
15- directory-1.2.7.0
15- directory-1.2.7.0
16- unliftio-core-0.1.1.0
16- unliftio-core-0.1.1.0
17−- process-1.6.5.1
18
17
19# Control whether we use the GHC we find on the path
18# Control whether we use the GHC we find on the path
20# system-ghc: true
19# system-ghc: true
stack-8.6.4.yamldeleted−4
@@ -1,4 +0,0 @@
1−resolver: lts-13.19
2−packages:
3−- '.'
4−extra-deps: []
stack-8.8.2.yamldeleted−5
@@ -1,5 +0,0 @@
1−resolver: lts-15.0
2−packages:
3−- '.'
4−extra-deps: []
5−
stack.yaml+1−1
@@ -1 +1 @@
1−stack-8.6.4.yaml
1+stack-8.0.2.yaml
tests/tests.hs+1−1
@@ -76,7 +76,7 @@ testFindImage =
76
76
77testDeleteImage :: IO ()
77testDeleteImage :: IO ()
78testDeleteImage = runDocker $ do
78testDeleteImage = runDocker $ do
79− img <- fmap fromJust findTestImage
79+ (Just img) <- 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