master..d44ca8b · docker-hs

git.iko.soy/docker-hs

9 files changed+8−49

unifiedsplit

.travis.yml−8 CHANGELOG.md−19 docker.cabal+6−6 src/Docker/Client/Types.hs−4 stack-7.10.yaml−1 stack-8.6.4.yaml−4 stack-8.8.2.yaml−5 stack.yaml+1−1 tests/tests.hs+1−1

.travis.yml−8

@@ -39,14 +39,6 @@ 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−

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−

5042addons:

5143 apt:

5244 packages:

CHANGELOG.md−19

@@ -1,24 +1,5 @@

11# CHANGELOG

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−

223## 0.5.1.1 (2018-03-09)

234

245- Bump aeson version.

docker.cabal+6−6

@@ -1,5 +1,5 @@

11name: docker

2−version: 0.6.0.3

2+version: 0.5.1.1

33synopsis: An API client for docker written in Haskell

44description: See API documentation below.

55homepage: https://github.com/denibertovic/docker-hs

@@ -25,12 +25,12 @@ library

2525 exposed-modules: Docker.Client, Docker.Client.Api, Docker.Client.Types, Docker.Client.Internal, Docker.Client.Http, Docker.Client.Utils

2626 -- other-modules: Docker.Internal

2727 build-depends: base >= 4.7 && < 5

28− , aeson >= 0.9.0 && < 2.0.0

28+ , aeson >= 0.9.0 && < 1.4.0

2929 , blaze-builder >= 0.4.0 && < 0.5.0

3030 , bytestring >= 0.10.0 && < 0.11.0

31− , containers >= 0.5.0 && < 0.7.0

31+ , containers >= 0.5.0 && < 0.6.0

3232 , 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

3434 , http-types >= 0.9 && < 0.13

3535 , vector

3636 , conduit

@@ -51,9 +51,9 @@ library

5151 , mtl >= 2.0.0 && < 3.0.0

5252 , network >= 2.6.0

5353 , text >= 1.0.0 && < 2.0.0

54− , time >= 1.5.0 && < 2.0.0

54+ , time >= 1.5.0 && < 1.9.0

5555 , scientific >= 0.3.0 && < 0.4.0

56− , tls >= 1.3.7 && < 1.6.0

56+ , tls >= 1.3.7 && < 1.5.0

5757 , unordered-containers >= 0.2.0 && < 0.3.0

5858 , x509 >= 1.6.0 && < 1.8.0

5959 , x509-store >= 1.6.0 && < 1.8.0

src/Docker/Client/Types.hs−4

@@ -1564,11 +1564,7 @@ instance FromJSON ContainerConfig where

15641564 macAddress labels stopSignal

15651565 parseJSON _ = fail "NetworkSettings is not an object."

15661566

1567−#if MIN_VERSION_base(4,13,0)

1568−parseIntegerText :: (MonadFail m) => Text -> m Integer

1569−#else

15701567parseIntegerText :: (Monad m) => Text -> m Integer

1571−#endif

15721568parseIntegerText t = case readMaybe $ T.unpack t of

15731569 Nothing ->

15741570 fail "Could not parse Integer"

stack-7.10.yaml−1

@@ -14,7 +14,6 @@ flags: {}

1414extra-deps:

1515- directory-1.2.7.0

1616- unliftio-core-0.1.1.0

17−- process-1.6.5.1

1817

1918# Control whether we use the GHC we find on the path

2019# 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 =

7676

7777testDeleteImage :: IO ()

7878testDeleteImage = runDocker $ do

79− img <- fmap fromJust findTestImage

79+ (Just img) <- findTestImage

8080 result <- deleteImage defaultImageDeleteOpts (imageId img)

8181 lift $ assert $ isRight result

8282 maybeTestImageAfter <- findTestImage