a52b484...master · docker-hs

git.iko.soy/docker-hs

9 files changed+40−7

since splitsnapshots

unifiedsplit

.travis.yml+8 CHANGELOG.md+11 docker.cabal+5−5 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,6 +39,14 @@ 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+

4250addons:

4351 apt:

4452 packages:

CHANGELOG.md+11

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

11# CHANGELOG

3+## 0.6.0.3 (2020-02-17)

5+- Support for ghc 8.8.2.

6+- Bump dependency version.

7+- Use MonadFail for later versions.

9+## 0.6.0.1 (2019-05-23)

10+

11+- Support ghc 8.6.4.

12+- Bump containers version.

13+

314## 0.6.0.0 (2018-06-28)

415

516- Rename DeleteOpts to ContainerDeleteOpts.

docker.cabal+5−5

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

11name: docker

2−version: 0.6.0.0

2+version: 0.6.0.3

33synopsis: An API client for docker written in Haskell

44description: See API documentation below.

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

@@ -28,9 +28,9 @@ 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

33− , http-client >= 0.4.0 && < 0.6.0

33+ , http-client >= 0.4.0 && < 0.7.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 && < 1.9.0

54+ , time >= 1.5.0 && < 2.0.0

5555 , scientific >= 0.3.0 && < 0.4.0

56− , tls >= 1.3.7 && < 1.5.0

56+ , tls >= 1.3.7 && < 1.6.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,7 +1564,11 @@ 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

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

1571+#endif

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

15691573 Nothing ->

15701574 fail "Could not parse Integer"

stack-7.10.yaml+1

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

1414extra-deps:

1515- directory-1.2.7.0

1616- unliftio-core-0.1.1.0

17+- process-1.6.5.1

1718

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

1920# system-ghc: true

stack-8.6.4.yamlnew file+4

@@ -0,0 +1,4 @@

1+resolver: lts-13.19

2+packages:

3+- '.'

4+extra-deps: []

stack-8.8.2.yamlnew file+5

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

1+resolver: lts-15.0

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