on master help sign in
.gitignore+2
since splitsnapshots
unifiedsplit
@@ -3,3 +3,5 @@
3/dist/
3/dist/
4*~
4*~
5.stack-work/
5.stack-work/
6+dist-newstyle
7+/cabal.project.local
.travis.yml+41−7
@@ -1,4 +1,11 @@
1sudo: required
1sudo: required
2+dist: trusty
3+
4+# Only build master and release tags
5+branches:
6+ only:
7+ - master
8+ - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
2
9
3# Choose a lightweight base image; we provide our own build tools.
10# Choose a lightweight base image; we provide our own build tools.
4language:
11language:
@@ -15,7 +22,30 @@ services:
15 - docker
22 - docker
16
23
17env:
24env:
25+ global:
26+ - RUN_INTEGRATION_TESTS=1
18− - STACK_ARGS=""
27+ - STACK_ARGS=""
28+
29+ matrix:
30+ - DOCKER_VERSION="1.12.3-0~trusty" GHCVER=7.10
31+ - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=7.10
32+ - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=7.10
33+
34+ - DOCKER_VERSION="1.12.3-0~trusty" GHCVER=8.0
35+ - DOCKER_VERSION="1.13.1-0~ubuntu-trusty" GHCVER=8.0
36+ - DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" GHCVER=8.0
37+
38+ - DOCKER_VERSION="1.12.3-0~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
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
19
49
20addons:
50addons:
21 apt:
51 apt:
@@ -23,20 +53,24 @@ addons:
23 - libgmp-dev
53 - libgmp-dev
24
54
25before_install:
55before_install:
26− # Upgrade docker to 1.12
56+ # Upgrade docker to 1.12.3.0
27 - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list'
57 - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list'
28 - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
58 - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
29 - sudo apt-get update
59 - sudo apt-get update
30− - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine
60+ - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=$DOCKER_VERSION
61+
62+install:
31 - mkdir -p "$HOME"/.local/bin
63 - mkdir -p "$HOME"/.local/bin
32 - export PATH=$HOME/.local/bin:$PATH
64 - export PATH=$HOME/.local/bin:$PATH
33−
65+ - export STACK_YAML=stack-$GHCVER.yaml
34 # install Stack
66 # install Stack
35 - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C $HOME/.local/bin '*/stack'
67 - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C $HOME/.local/bin '*/stack'
36− - export PATH=$(stack --stack-yaml stack.yaml path --local-install-root):$PATH
68+ - export PATH=$(stack path --local-install-root):$PATH
37− - stack setup
69+ - stack --version
38−
39
70
40script:
71script:
72+ - stack setup
73+ - stack update
74+ - stack build
41 - stack test
75 - stack test
42
76
CHANGELOG.md+79
@@ -1,5 +1,84 @@
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)
23+
24+- Bump aeson version.
25+
26+## 0.5.1.0 (2018-02-23)
27+
28+- Support http-conduit-2.3.0.
29+- Bump http-types versions.
30+
31+## 0.5.0.1 (2018-01-26)
32+
33+- Bumps upper bound for http-types (properly this time).
34+
35+## 0.5.0.0 (2018-01-24)
36+
37+- Added (some) contribution and general docs
38+- Fix case when stopping non-existent container
39+- Added more integration tests
40+- Fixed error while parsing list container endpoint output
41+- Changed State/Status data type (related to the above fix)
42+- Added tests against different docker version to travis CIA
43+- Fixed EnvVar JSON encoding
44+- Fixed NetworkMode parsing
45+- Allow http-types 0.11
46+
47+## 0.4.1.1 (2017-10-16)
48+
49+- Small change to add env var for skipping integration tests.
50+ This is mostly to avoid running those on stackage.
51+
52+## 0.4.1.0 (2017-10-04)
53+
54+- Relaxed aeson, tls and time upper bounds
55+
56+
57+## 0.4.0.2 (2017-09-19)
58+
59+- Support LTS 9.4
60+
61+## 0.4.0.1 (2017-06-29)
62+
63+- fixes omKillDisable parsing from json
64+- adds Entrypoint data type and tests edge cases
65+- more tests
66+- small comsmetic changes
67+
68+## 0.4.0.0 (2017-03-20)
69+
70+- Adds streaming support via conduits (changes API a bit hence the major version release)
71+- Added support for streaming log output
72+- Added support for pulling images from the hub (and streaming the output)
73+
74+## 0.3.0.1 (2016-09-07)
75+
76+- Small cosmetic changes and marking OVERLAPPING instance
77+
78+## 0.3.0.0 (2016-09-06)
79+
80+Major rewrite
81+
3## 0.2.0.4 (2016-02-11)
82## 0.2.0.4 (2016-02-11)
4
83
5- Adds function for getting all containers and images
84- Adds function for getting all containers and images
CONTRIBUTING.mdnew file+14
@@ -0,0 +1,14 @@
1+# Contributing
2+
3+If you wish to contribute please see [any issue on GitHub tagged with "help
4+wanted"](https://github.com/denibertovic/docker-hs/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
5+Before starting to work, consider commenting on the issue you want to resolve or
6+open a new issue to discuss design decisions and implementation details. This is
7+so that no development cycles go to waste on implementing a feature that might
8+not get merged either because of implementation details or other reasons.
9+
10+Make sure to submit your PR's against the `master` branch.
11+
12+## Project Setup
13+
14+See the `README.md` file on how to setup the project on your development machine.
Makefile+28−5
@@ -1,19 +1,42 @@
1−.PHONY: test build upload dist repl sdist
1+.PHONY: build repl test release help
2
2
3+.DEFAULT_GOAL = help
4+
5+PROJECT_NAME ?= $(shell grep "^name" docker.cabal | cut -d " " -f17)
3VERSION ?= $(shell grep "^version:" docker.cabal | cut -d " " -f14)
6VERSION ?= $(shell grep "^version:" docker.cabal | cut -d " " -f14)
7+RESOLVER ?= $(shell grep "^resolver:" stack.yaml | cut -d " " -f2)
8+GHC_VERSION ?= $(shell stack ghc -- --version | cut -d " " -f8)
9+ARCH=$(shell uname -m)
4
10
11+## Run build
5build:
12build:
6 @stack build
13 @stack build
7
14
15+## Run repl
8repl:
16repl:
9 @stack repl
17 @stack repl
10
18
19+## Run tests. Example RUN_INTEGRATION_TESTS=1 make test
11test:
20test:
12− @stack test
21+ @RUN_INTEGRATION_TESTS=1 stack test
13
22
14−sdist:
23+## Cut new release
24+release:
25+ @stack build --haddock
15 @stack sdist
26 @stack sdist
27+ @echo "\n\nDone. Now run: \n\nstack upload <path_to_tarball>\n"
28+ @echo "\nAnd: \n\ngit tag ${VERSION} && git push --tags\n"
16
29
17−upload: dist
30+## Show help screen.
18− @stack upload .stack-work/dist/x86_64-linux/Cabal-1.18.1.5/docker-${VERSION}.tar.gz
31+help:
32+ @echo "Please use \`make <target>' where <target> is one of\n\n"
33+ @awk '/^[a-zA-Z\-\_0-9]+:/ { \
34+ helpMessage = match(lastLine, /^## (.*)/); \
35+ if (helpMessage) { \
36+ helpCommand = substr($$1, 0, index($$1, ":")-1); \
37+ helpMessage = substr(lastLine, RSTART + 3, RLENGTH); \
38+ printf "%-30s %s\n", helpCommand, helpMessage; \
39+ } \
40+ } \
41+ { lastLine = $$0 }' $(MAKEFILE_LIST)
19
42
README.md+36−11
@@ -1,23 +1,48 @@
1−# Docker Remote API wrapper for Haskell
1+# An API client for docker written in Haskell
2+
3+| Master |
4+| -------|
5+| [![master](https://travis-ci.org/denibertovic/docker-hs.svg?branch=master)](https://travis-ci.org/denibertovic/docker-hs) |
2
6
3−Travis CI : [![Build Status](https://travis-ci.org/denibertovic/docker-hs.svg?branch=master)](https://travis-ci.org/denibertovic/docker-hs)
4
7
5## Current state
8## Current state
6
9
7−**Not production ready yet!**
10+Supported Docker Engine Api version: `v1.24` and onwards.
8
11
9−The library is going through a **total rewrite**.
12+Anything upward of that should work since Docker versions their API.
13+Older docker version and engine api versions are not supported at the moment.
10
14
11−See [Issue #12](https://github.com/denibertovic/docker-hs/issues/12) for things
15+## Documentation
12−that need to happen before a new release.
13
16
17+The API-documentation is available at
18+[Hackage](https://hackage.haskell.org/package/docker). There are also some
19+usage-examples in the main library source file,
20+[`Client.hs`](https://hackage.haskell.org/package/docker/docs/Docker-Client.html).
14
21
15## Contributing
22## Contributing
16
23
17−If you wish to contribute please see the Issue mentioned above or any issue tagged with "help wanted".
24+Please see [CONTRIBUTING.md](CONTRIBUTING.md).
18−Make sure to submit your PR's against the `dev` branch.
25+
26+### Project Setup
27+
28+For working on the library, you need the Haskell Tool Stack installed (see [the
29+Haskell Tool Stack
30+website](https://docs.haskellstack.org/en/stable/install_and_upgrade/)). You
31+also need `make` to use the `Makefile` included in the project. Run `make help`
32+to see the available commands (for building, running the tests and releasing).
33+
34+### Tests
35+
36+Tests are located in the `tests` directory and can be run with `make test`. This
37+only runs the unit tests.
38+
39+To run integration tests, you need Docker installed and listening on Port `2375`
40+of `localhost` (docker only listens to a Unix socket by default, see the [Docker
41+documentation](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-socket-option)
42+for details). Set the environment variable `RUN_INTEGRATION_TESTS`, i.e.
43+`RUN_INTEGRATION_TESTS=1 make test`.
19
44
20−Please consider filling an Issue first and discuss design decisions and implementation details before
45+## IRC
21−writing any code. This is so that no development cycles go to waste on implementing a feature that
22−might not get merged either because of implementation details or other reasons.
23
46
47+If you have any questions or suggestions you can find the maintainers in `#docker-haskell`
48+on freenode.
docker.cabal+50−26
@@ -1,7 +1,7 @@
1name: docker
1name: docker
2−version: 0.3.0.0
2+version: 0.6.0.3
3−synopsis: Haskell wrapper for Docker Remote API
3+synopsis: An API client for docker written in Haskell
4−description: See README.md
4+description: See API documentation below.
5homepage: https://github.com/denibertovic/docker-hs
5homepage: https://github.com/denibertovic/docker-hs
6license: BSD3
6license: BSD3
7license-file: LICENSE
7license-file: LICENSE
@@ -14,35 +14,57 @@ extra-source-files: README.md
14cabal-version: >=1.10
14cabal-version: >=1.10
15stability: experimental
15stability: experimental
16
16
17+-- Flag small-http-conduit
18+-- Description: Resolve whether http-conduit < 2.3.0.
19+-- Manual: False
20+-- Default: True
21+
17library
22library
18− default-extensions: DeriveGeneric, OverloadedStrings, ScopedTypeVariables, ExplicitForAll, MultiParamTypeClasses, FlexibleContexts, GeneralizedNewtypeDeriving, RankNTypes, DeriveFunctor, FlexibleInstances
23+ default-extensions: DeriveGeneric, OverloadedStrings, ScopedTypeVariables, ExplicitForAll, MultiParamTypeClasses, FlexibleContexts, GeneralizedNewtypeDeriving, RankNTypes, DeriveFunctor, FlexibleInstances, CPP
19 hs-source-dirs: src
24 hs-source-dirs: src
20− exposed-modules: Docker, Docker.Client, Docker.Client.Types, Docker.Client.Internal, Docker.Client.Http
25+ exposed-modules: Docker.Client, Docker.Client.Api, Docker.Client.Types, Docker.Client.Internal, Docker.Client.Http, Docker.Client.Utils
21 -- other-modules: Docker.Internal
26 -- other-modules: Docker.Internal
22 build-depends: base >= 4.7 && < 5
27 build-depends: base >= 4.7 && < 5
23− , aeson
28+ , aeson >= 0.9.0 && < 2.0.0
24− , blaze-builder
29+ , blaze-builder >= 0.4.0 && < 0.5.0
25− , bytestring
30+ , bytestring >= 0.10.0 && < 0.11.0
26− , containers
31+ , containers >= 0.5.0 && < 0.7.0
27− , connection
28− , data-default-class
32+ , data-default-class >= 0.0.1 && < 0.2.0
33+ , http-client >= 0.4.0 && < 0.7.0
34+ , http-types >= 0.9 && < 0.13
35+ , vector
36+ , conduit
37+ , conduit-combinators
38+ , conduit-extra
29 , exceptions
39 , exceptions
30− , http-client
40+ , monad-control
31− , http-types
41+ , resourcet
32− , lens
33− , lens-aeson
34− , lifted-base
35− , mtl
36− , network >= 2.6
37− , network-uri
38− , text
39− , time
40− , tls >= 1.3.7
41 , transformers
42 , transformers
43+ , transformers-base
44+ , tar
45+ , zlib
46+ , uuid
47+ , temporary
48+ , directory >= 1.2.5.0
49+ , filemanip
50+ , filepath
51+ , mtl >= 2.0.0 && < 3.0.0
52+ , network >= 2.6.0
53+ , text >= 1.0.0 && < 2.0.0
54+ , time >= 1.5.0 && < 2.0.0
55+ , scientific >= 0.3.0 && < 0.4.0
56+ , tls >= 1.3.7 && < 1.6.0
42− , unordered-containers
57+ , unordered-containers >= 0.2.0 && < 0.3.0
43− , x509
58+ , x509 >= 1.6.0 && < 1.8.0
44− , x509-store
59+ , x509-store >= 1.6.0 && < 1.8.0
45− , x509-system
60+ , x509-system >= 1.6.0 && < 1.8.0
61+ , http-conduit
62+ , unliftio-core >= 0.1.0.0 && < 0.2.0
63+ -- if flag(small-http-conduit)
64+ -- build-depends: http-conduit < 2.3.0
65+ -- else
66+ -- build-depends: http-conduit >= 2.3.0
67+ -- , unliftio-core
46 default-language: Haskell2010
68 default-language: Haskell2010
47 ghc-options: -Wall -fno-warn-name-shadowing
69 ghc-options: -Wall -fno-warn-name-shadowing
48
70
@@ -51,6 +73,7 @@ test-suite docker-hs-tests
51 , bytestring
73 , bytestring
52 , connection
74 , connection
53 , docker
75 , docker
76+ , directory
54 , aeson
77 , aeson
55 , containers
78 , containers
56 , unordered-containers
79 , unordered-containers
@@ -66,6 +89,7 @@ test-suite docker-hs-tests
66 , transformers
89 , transformers
67 , QuickCheck
90 , QuickCheck
68 , process
91 , process
92+ , vector
69 type: exitcode-stdio-1.0
93 type: exitcode-stdio-1.0
70 main-is: tests.hs
94 main-is: tests.hs
71 hs-source-dirs: tests
95 hs-source-dirs: tests
examples/Example.hsnew file+64
@@ -0,0 +1,64 @@
1+import Docker.Client
2+
3+runNginxContainer :: IO ContainerID
4+runNginxContainer = do
5+ h <- defaultHttpHandler
6+ runDockerT (defaultClientOpts, h) $
7+ do let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
8+ let myCreateOpts = addPortBinding pb $ defaultCreateOpts "nginx:latest"
9+ cid <- createContainer myCreateOpts (Just "myNginxContainer")
10+ case cid of
11+ Left err -> error $ show err
12+ Right i -> do
13+ _ <- startContainer defaultStartOpts i
14+ return i
15+
16+stopNginxContainer :: ContainerID -> IO ()
17+stopNginxContainer cid = do
18+ h <- defaultHttpHandler
19+ runDockerT (defaultClientOpts, h) $
20+ do r <- stopContainer DefaultTimeout cid
21+ case r of
22+ Left _ -> error "I failed to stop the container"
23+ Right _ -> return ()
24+
25+runPostgresContainer :: IO ContainerID
26+runPostgresContainer = do
27+ h <- defaultHttpHandler
28+ runDockerT (defaultClientOpts, h) $
29+ do let pb = PortBinding 5432 TCP [HostPort "0.0.0.0" 5432]
30+ let b = Bind "/tmp" "/tmp" Nothing
31+ let myCreateOpts = addBind b $ addPortBinding pb $ defaultCreateOpts "postgres:9.5"
32+ cid <- createContainer myCreateOpts Nothing
33+ case cid of
34+ Left err -> error $ show err
35+ Right i -> do
36+ _ <- startContainer defaultStartOpts i
37+ return i
38+
39+-- | Example of how we can start a database container while hosting it's
40+-- data in a data volume living inside another container.
41+runPostgresWithDataContainer :: IO ContainerID
42+runPostgresWithDataContainer = do
43+ h <- defaultHttpHandler
44+ runDockerT (defaultClientOpts, h) $
45+ -- We use a dummy command like /bin/true because we don't want to start
46+ -- the postgres database in the data container we just want it to
47+ -- create a container filesystem for us.
48+ do let dataOpts = setCmd "/bin/true" $ defaultCreateOpts "postgres:9.5"
49+ cid <- createContainer dataOpts (Just "myDataContainer")
50+ _ <-
51+ case cid of
52+ Left err -> error $ show err
53+ Right i -> startContainer defaultStartOpts i
54+ let pb = PortBinding 5432 TCP [HostPort "0.0.0.0" 5432]
55+ -- Default permission is read-write if we don't specify anything
56+ let vf = VolumeFrom "myDataContainer" Nothing
57+ let myCreateOpts = addVolumeFrom vf $ addPortBinding pb $ defaultCreateOpts "postgres:9.5"
58+ ccid <- createContainer myCreateOpts (Just "pgContainer")
59+ case ccid of
60+ Left err -> error $ show err
61+ Right i -> do
62+ _ <- startContainer defaultStartOpts i
63+ return i
64+
scripts/hackage-docs.shnew file+22
@@ -0,0 +1,22 @@
1+#!/bin/bash
2+
3+# Run this script in the top-level of your package directory
4+# (where the .cabal file is) to compile documentation and
5+# upload it to hackage.
6+
7+# Requirements:
8+# cabal-install-1.24 (for --for-hackage)
9+# haddock 2.17 (for the hyperlinked source)
10+
11+set -e
12+
13+VERSION=`grep "^version:" docker.cabal | cut -d " " -f14`
14+BUILDDIR=dist-newstyle/build/docker-$VERSION
15+DOCSDIRNAME=docker-$VERSION-docs
16+
17+cabal act-as-setup -- haddock --builddir=$BUILDDIR --for-hackage --hyperlink-sources
18+cd $BUILDDIR/doc/html && tar --format=ustar -zcvf $DOCSDIRNAME.tar.gz $DOCSDIRNAME
19+
20+echo NOW RUN: \n\n
21+echo cabal upload -d $BUILDDIR/doc/html/$DOCSDIRNAME.tar.gz
22+
src/Docker.hsdeleted−13
@@ -1,13 +0,0 @@
1−{-# LANGUAGE ExplicitForAll #-}
2−{-# LANGUAGE ScopedTypeVariables #-}
3−
4−module Docker (
5− module Docker.Client
6− , module Docker.Client.Types
7− , module Docker.Client.Http
8− ) where
9−
10−import Docker.Client
11−import Docker.Client.Http
12−import Docker.Client.Types
13−
src/Docker/Client.hs+111−110
@@ -1,118 +1,119 @@
1{-# LANGUAGE ExplicitForAll #-}
1{-# LANGUAGE ExplicitForAll #-}
2{-# LANGUAGE ScopedTypeVariables #-}
2{-# LANGUAGE ScopedTypeVariables #-}
3
3
4+{-|
5+Module : Docker.Client
6+Copyright : (c) Deni Bertovic, 2014
7+License : BSD3
8+Maintainer : deni@denibertovic.com
9+Stability : experimental
10+Portability : POSIX
11+
12+= Getting started
13+
14+Creating a container:
15+
16+We're going to create a nginx container and we're going to map port @80@ from within the container to port @8000@ on
17+the host.
18+
19+@
20+import Docker.Client
21+
22+runNginxContainer :: IO ContainerID
23+runNginxContainer = do
24+ h <- defaultHttpHandler
25+ runDockerT (defaultClientOpts, h) $ do
26+ let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
27+ let myCreateOpts = addPortBinding pb $ defaultCreateOpts "nginx:latest"
28+ cid <- createContainer myCreateOpts
29+ case cid of
30+ Left err -> error $ show err
31+ Right i -> do
32+ _ <- startContainer defaultStartOpts i
33+ return i
34+@
35+
36+Let's start out nginx container:
37+
38+>>> cid <- runNginxContainer
39+
40+
41+Visit http://localhost:8000 and verify that nginx is running.
42+
43+Let's stop the container now:
44+
45+@
46+stopNginxContainer :: ContainerID -> IO ()
47+stopNginxContainer cid = do
48+ h <- defaultHttpHandler
49+ runDockerT (defaultClientOpts, h) $ do
50+ r <- stopContainer DefaultTimeout cid
51+ case r of
52+ Left err -> error "I failed to stop the container"
53+ Right _ -> return ()
54+@
55+
56+>>> stopNginxContainer cid
57+
58+Let's start a Postgres container by mapping the \/tmp directory from within the container to the
59+\/tmp directory on the host. That way we make sure that the data we write to \/tmp in the container will
60+persist on the host file system.
61+
62+@
63+runPostgresContainer :: IO ContainerID
64+runPostgresContainer = do
65+ h <- defaultHttpHandler
66+ runDockerT (defaultClientOpts, h) $ do
67+ let pb = PortBinding 5432 TCP [HostPort "0.0.0.0" 5432]
68+ let myCreateOpts = addBinds [Bind "\/tmp" "\/tmp" Nothing] $ addPortBinding pb $ defaultCreateOpts "postgres:9.5"
69+ cid <- createContainer myCreateOpts
70+ case cid of
71+ Left err -> error $ show err
72+ Right i -> do
73+ _ <- startContainer defaultStartOpts i
74+ return i
75+@
76+
77+= Get Docker API Version
78+
79+>>> h <- defaultHttpHandler
80+>>> runDockerT (defaultClientOpts, h) $ getDockerVersion
81+Right (DockerVersion {version = "1.12.0", apiVersion = "1.24", gitCommit = "8eab29e", goVersion = "go1.6.3", os = "linux", arch = "amd64", kernelVersion = "4.6.0-1-amd64", buildTime = "2016-07-28T21:46:40.664812891+00:00"})
82+
83+= Setup SSL Authentication
84+
85+Let's create a custom 'HttpHandler' that uses a client's certificate and private key for SSL authentication.
86+It also accepts a self-signed CA certificate which is specified via 'clientParamsSetCA'.
87+This handler can replace 'defaultHttpHandler' in the arguments to 'runDockerT'.
88+
89+@
90+let host = "domain.name"
91+let port = fromInteger 4000
92+let privKey = "path\/to\/private\/key"
93+let cert = "path\/to\/certificate"
94+let ca = "path\/to\/CA"
95+paramsE <- clientParamsWithClientAuthentication host port privKey cert
96+case paramsE of
97+ Left err ->
98+ error err
99+ Right params' -> do
100+ params <- clientParamsSetCA params' ca
101+ settings <- HTTP.mkManagerSettings (TLSSettings params) Nothing
102+ manager <- newManager settings
103+ return $ httpHandler manager
104+@
105+
106+
107+-}
4module Docker.Client (
108module Docker.Client (
5− runDockerT
109+ -- * Client functions
6− , DockerT
110+ module Docker.Client.Api
7− , DockerError(..)
111+ -- * Types
8− , DockerClientOpts(..)
112+ , module Docker.Client.Types
9− , defaultClientOpts
113+ -- * Http
10− , HttpHandler
114+ , module Docker.Client.Http
11− , defaultHttpHandler
12− , httpHandler
13− , unixHttpHandler
14− , clientParamsWithClientAuthentication
15− , clientParamsSetCA
16− , getDockerVersion
17− , listContainers
18− , listImages
19− , createContainer
20− , startContainer
21− , stopContainer
22− , killContainer
23− , restartContainer
24− , pauseContainer
25− , unpauseContainer
26− , deleteContainer
27− , inspectContainer
28− , getContainerLogs
29 ) where
115 ) where
30
116
31−import Control.Monad.Except (ExceptT (..), runExceptT, throwError)
117+import Docker.Client.Api
32−import Control.Monad.Reader (ask, lift)
33−import Data.Aeson (FromJSON, eitherDecode')
34−import qualified Data.ByteString.Lazy as BSL
35−import qualified Data.Text as Text
36−import Network.HTTP.Client (responseBody, responseStatus)
37−import Network.HTTP.Types (StdMethod (..))
38−
39import Docker.Client.Http
118import Docker.Client.Http
40import Docker.Client.Types
119import Docker.Client.Types
41−
42−requestUnit :: (Monad m) => HttpVerb -> Endpoint -> DockerT m (Either DockerError ())
43−requestUnit verb endpoint = const (Right ()) <$> requestHelper verb endpoint
44−
45−requestHelper :: (Monad m) => HttpVerb -> Endpoint -> DockerT m (Either DockerError Response)
46−requestHelper verb endpoint = runExceptT $ do
47− (opts, httpHandler) <- lift ask
48− case mkHttpRequest verb endpoint opts of
49− Nothing ->
50− throwError $ DockerInvalidRequest endpoint
51− Just request -> do
52− response <- ExceptT $ lift $ httpHandler request
53−
54− -- Check status code.
55− let status = responseStatus response
56− maybe (return ()) throwError $
57− statusCodeToError endpoint status
58−
59− return response
60−
61−parseResponse :: (FromJSON a, Monad m) => Either DockerError Response -> DockerT m (Either DockerError a)
62−parseResponse (Left err) =
63− return $ Left err
64−parseResponse (Right response) =
65− -- Parse request body.
66− case eitherDecode' $ responseBody response of
67− Left err ->
68− return $ Left $ DockerClientDecodeError $ Text.pack err
69− Right r ->
70− return $ Right r
71−
72−getDockerVersion :: forall m. Monad m => DockerT m (Either DockerError DockerVersion)
73−getDockerVersion = requestHelper GET VersionEndpoint >>= parseResponse
74−
75−listContainers :: forall m. Monad m => ListOpts -> DockerT m (Either DockerError [Container])
76−listContainers opts = requestHelper GET (ListContainersEndpoint opts) >>= parseResponse
77−
78−listImages :: forall m. Monad m => ListOpts -> DockerT m (Either DockerError [Image])
79−listImages opts = requestHelper GET (ListImagesEndpoint opts) >>= parseResponse
80−
81−createContainer :: forall m. Monad m => CreateOpts -> DockerT m (Either DockerError ContainerID)
82−createContainer opts = requestHelper POST (CreateContainerEndpoint opts) >>= parseResponse
83−
84−-- TODO: Is this the correct return type? XXX
85−-- convert status code to unit or error
86−startContainer :: forall m. Monad m => StartOpts -> ContainerID -> DockerT m (Either DockerError ())
87−startContainer sopts cid = requestUnit POST $ StartContainerEndpoint sopts cid
88−
89−stopContainer :: forall m. Monad m => Timeout -> ContainerID -> DockerT m (Either DockerError ())
90−stopContainer t cid = requestUnit POST $ StopContainerEndpoint t cid
91−
92−killContainer :: forall m. Monad m => Signal -> ContainerID -> DockerT m (Either DockerError ())
93−killContainer s cid = requestUnit POST $ KillContainerEndpoint s cid
94−
95−restartContainer :: forall m. Monad m => Timeout -> ContainerID -> DockerT m (Either DockerError ())
96−restartContainer t cid = requestUnit POST $ RestartContainerEndpoint t cid
97−
98−pauseContainer :: forall m. Monad m => ContainerID -> DockerT m (Either DockerError ())
99−pauseContainer cid = requestUnit POST $ PauseContainerEndpoint cid
100−
101−unpauseContainer :: forall m. Monad m => ContainerID -> DockerT m (Either DockerError ())
102−unpauseContainer cid = requestUnit GET $ UnpauseContainerEndpoint cid
103−
104−deleteContainer :: forall m. Monad m => DeleteOpts -> ContainerID -> DockerT m (Either DockerError ())
105−deleteContainer dopts cid = requestUnit DELETE $ DeleteContainerEndpoint dopts cid
106−
107−inspectContainer :: forall m . Monad m => ContainerID -> DockerT m (Either DockerError ContainerDetails)
108−inspectContainer cid = requestHelper GET (InspectContainerEndpoint cid) >>= parseResponse
109−
110−getContainerLogs :: forall m. Monad m => LogOpts -> ContainerID -> DockerT m (Either DockerError BSL.ByteString)
111−getContainerLogs logopts cid = fmap responseBody <$> requestHelper GET (ContainerLogsEndpoint logopts False cid)
112−
113−-- TODO: Use http-conduit to output to a sink.
114−-- getContainerLogsStream :: forall m. Monad m => Sink BSL.ByteString m b -> LogOpts -> ContainerID -> DockerT m (Either DockerError b)
115−-- getContainerLogsStream sink logopts cid = runResourceT $ do
116−-- response <- http request manager
117−-- responseBody response C.$$+- sink
118−
src/Docker/Client/Api.hsnew file+227
@@ -0,0 +1,227 @@
1+{-# LANGUAGE ExplicitForAll #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+
4+module Docker.Client.Api (
5+ -- * Containers
6+ listContainers
7+ , createContainer
8+ , startContainer
9+ , stopContainer
10+ , waitContainer
11+ , killContainer
12+ , restartContainer
13+ , pauseContainer
14+ , unpauseContainer
15+ , deleteContainer
16+ , inspectContainer
17+ , getContainerLogs
18+ , getContainerLogsStream
19+ -- * Images
20+ , listImages
21+ , deleteImage
22+ , buildImageFromDockerfile
23+ , pullImage
24+ -- * Network
25+ , createNetwork
26+ , removeNetwork
27+ -- * Other
28+ , getDockerVersion
29+ ) where
30+
31+import Control.Monad.Catch (MonadMask (..))
32+import Control.Monad.IO.Class
33+import Control.Monad.Reader (ask, lift)
34+import Data.Aeson (FromJSON, eitherDecode')
35+import qualified Data.ByteString as BS
36+import qualified Data.ByteString.Lazy as BSL
37+import Data.Conduit (Sink)
38+import qualified Data.Conduit.Binary as Conduit
39+import qualified Data.Text as T
40+import qualified Data.Text as Text
41+import Network.HTTP.Client (responseStatus)
42+import Network.HTTP.Types (StdMethod (..))
43+import System.Exit (ExitCode (..))
44+
45+import Docker.Client.Http
46+import Docker.Client.Types
47+import Docker.Client.Utils
48+
49+requestUnit :: (MonadIO m, MonadMask m) => HttpVerb -> Endpoint -> DockerT m (Either DockerError ())
50+requestUnit verb endpoint = fmap (const ()) <$> requestHelper verb endpoint
51+
52+requestHelper :: (MonadIO m, MonadMask m) => HttpVerb -> Endpoint -> DockerT m (Either DockerError BSL.ByteString)
53+requestHelper verb endpoint = requestHelper' verb endpoint Conduit.sinkLbs
54+
55+requestHelper' :: (MonadIO m, MonadMask m) => HttpVerb -> Endpoint -> Sink BS.ByteString m a -> DockerT m (Either DockerError a)
56+requestHelper' verb endpoint sink = do
57+ (opts, HttpHandler httpHandler) <- ask
58+ case mkHttpRequest verb endpoint opts of
59+ Nothing ->
60+ return $ Left $ DockerInvalidRequest endpoint
61+ Just request -> do
62+ -- JP: Do we need runResourceT?
63+ -- lift $ NHS.httpSink request $ \response ->
64+ lift $ httpHandler request $ \response ->
65+ -- Check status code.
66+ let status = responseStatus response in
67+ case statusCodeToError endpoint status of
68+ Just err ->
69+ return $ Left err
70+ Nothing ->
71+ fmap Right sink
72+
73+parseResponse :: (FromJSON a, Monad m) => Either DockerError BSL.ByteString -> DockerT m (Either DockerError a)
74+parseResponse (Left err) =
75+ return $ Left err
76+parseResponse (Right response) =
77+ -- Parse request body.
78+ case eitherDecode' response of
79+ Left err ->
80+ return $ Left $ DockerClientDecodeError $ Text.pack err
81+ Right r ->
82+ return $ Right r
83+
84+-- | Gets the version of the docker engine remote API.
85+getDockerVersion :: forall m. (MonadIO m, MonadMask m) => DockerT m (Either DockerError DockerVersion)
86+getDockerVersion = requestHelper GET VersionEndpoint >>= parseResponse
87+
88+-- | Lists all running docker containers. Pass in @'defaultListOpts' {all
89+-- = True}@ to get a list of stopped containers as well.
90+listContainers :: forall m. (MonadIO m, MonadMask m) => ListOpts -> DockerT m (Either DockerError [Container])
91+listContainers opts = requestHelper GET (ListContainersEndpoint opts) >>= parseResponse
92+
93+-- | Lists all docker images.
94+listImages :: forall m. (MonadIO m, MonadMask m) => ListOpts -> DockerT m (Either DockerError [Image])
95+listImages opts = requestHelper GET (ListImagesEndpoint opts) >>= parseResponse
96+
97+-- | Deletes an image with the given 'ImageID'.
98+-- See "ImageDeleteOpts" for options and use 'defaultImageDeleteOpts' for sane
99+-- defaults.
100+deleteImage :: forall m. (MonadIO m, MonadMask m) => ImageDeleteOpts -> ImageID -> DockerT m (Either DockerError ())
101+deleteImage dopts iid = requestUnit DELETE $ DeleteImageEndpoint dopts iid
102+
103+-- | Creates a docker container but does __not__ start it. See
104+-- 'CreateOpts' for a list of options and you can use 'defaultCreateOpts'
105+-- for some sane defaults.
106+createContainer :: forall m. (MonadIO m, MonadMask m) => CreateOpts -> Maybe ContainerName -> DockerT m (Either DockerError ContainerID)
107+createContainer opts cn = requestHelper POST (CreateContainerEndpoint opts cn) >>= parseResponse
108+
109+-- | Start a container from a given 'ContainerID' that we get from
110+-- 'createContainer'. See 'StartOpts' for a list of configuration options
111+-- for starting a container. Use 'defaultStartOpts' for sane defaults.
112+startContainer :: forall m. (MonadIO m, MonadMask m) => StartOpts -> ContainerID -> DockerT m (Either DockerError ())
113+startContainer sopts cid = requestUnit POST $ StartContainerEndpoint sopts cid
114+
115+-- | Attempts to stop a container with the given 'ContainerID' gracefully
116+-- (SIGTERM).
117+-- The docker daemon will wait for the given 'Timeout' and then send
118+-- a SIGKILL killing the container.
119+stopContainer :: forall m. (MonadIO m, MonadMask m) => Timeout -> ContainerID -> DockerT m (Either DockerError ())
120+stopContainer t cid = requestUnit POST $ StopContainerEndpoint t cid
121+
122+-- | Blocks until a container with the given 'ContainerID' stops,
123+-- then returns the exit code
124+waitContainer :: forall m. (MonadIO m, MonadMask m) => ContainerID -> DockerT m (Either DockerError ExitCode)
125+waitContainer cid = fmap (fmap statusCodeToExitCode) (requestHelper POST (WaitContainerEndpoint cid) >>= parseResponse)
126+ where
127+ statusCodeToExitCode (StatusCode 0) = ExitSuccess
128+ statusCodeToExitCode (StatusCode x) = ExitFailure x
129+
130+-- | Sends a 'Signal' to the container with the given 'ContainerID'. Same
131+-- as 'stopContainer' but you choose the signal directly.
132+killContainer :: forall m. (MonadIO m, MonadMask m) => Signal -> ContainerID -> DockerT m (Either DockerError ())
133+killContainer s cid = requestUnit POST $ KillContainerEndpoint s cid
134+
135+-- | Restarts a container with the given 'ContainerID'.
136+restartContainer :: forall m. (MonadIO m, MonadMask m) => Timeout -> ContainerID -> DockerT m (Either DockerError ())
137+restartContainer t cid = requestUnit POST $ RestartContainerEndpoint t cid
138+
139+-- | Pauses a container with the given 'ContainerID'.
140+pauseContainer :: forall m. (MonadIO m, MonadMask m) => ContainerID -> DockerT m (Either DockerError ())
141+pauseContainer cid = requestUnit POST $ PauseContainerEndpoint cid
142+
143+-- | Unpauses a container with the given 'ContainerID'.
144+unpauseContainer :: forall m. (MonadIO m, MonadMask m) => ContainerID -> DockerT m (Either DockerError ())
145+unpauseContainer cid = requestUnit GET $ UnpauseContainerEndpoint cid
146+
147+-- | Deletes a container with the given 'ContainerID'.
148+-- See "ContainerDeleteOpts" for options and use 'defaultContainerDeleteOpts' for sane
149+-- defaults.
150+deleteContainer :: forall m. (MonadIO m, MonadMask m) => ContainerDeleteOpts -> ContainerID -> DockerT m (Either DockerError ())
151+deleteContainer dopts cid = requestUnit DELETE $ DeleteContainerEndpoint dopts cid
152+
153+-- | Gets 'ContainerDetails' for a given 'ContainerID'.
154+inspectContainer :: forall m . (MonadIO m, MonadMask m) => ContainerID -> DockerT m (Either DockerError ContainerDetails)
155+inspectContainer cid = requestHelper GET (InspectContainerEndpoint cid) >>= parseResponse
156+
157+-- | Get's container's logs for a given 'ContainerID'.
158+-- This will only work with the 'JsonFile' 'LogDriverType' as the other driver types disable
159+-- this endpoint and it will return a 'DockerError'.
160+--
161+-- See 'LogOpts' for options that you can pass and
162+-- 'defaultLogOpts' for sane defaults.
163+--
164+-- __NOTE__: his function will fetch the entire log that the
165+-- container produced in the json-file on disk. Depending on the logging
166+-- setup of the process in your container this can be a significant amount
167+-- which might block your application...so use with caution.
168+--
169+-- If you want to stream the logs from the container continuosly then use
170+-- 'getContainerLogsStream'
171+--
172+-- __NOTE__: It's recommended to use one of the other 'LogDriverType's available (like
173+-- syslog) for creating your containers.
174+getContainerLogs :: forall m. (MonadIO m, MonadMask m) => LogOpts -> ContainerID -> DockerT m (Either DockerError BSL.ByteString)
175+getContainerLogs logopts cid = requestHelper GET (ContainerLogsEndpoint logopts False cid)
176+
177+{-| Continuously gets the container's logs as a stream. Uses conduit.
178+
179+__Example__:
180+
181+@
182+>>> import Docker.Client
183+>>> import Data.Maybe
184+>>> import Conduit
185+>>> h <- defaultHttpHanlder
186+>>> let cid = fromJust $ toContainerID "fee86e1d522b"
187+>>> runDockerT (defaultClientOpts, h) $ getContainerLogsStream defaultLogOpts cid stdoutC
188+@
189+
190+-}
191+getContainerLogsStream :: forall m b . (MonadIO m, MonadMask m) => LogOpts -> ContainerID -> Sink BS.ByteString m b -> DockerT m (Either DockerError b)
192+getContainerLogsStream logopts cid = requestHelper' GET (ContainerLogsEndpoint logopts True cid)
193+-- JP: Should the second (follow) argument be True? XXX
194+
195+-- | Build an Image from a Dockerfile
196+--
197+-- TODO: Add X-Registry-Config
198+--
199+-- TODO: Add support for remote URLs to a Dockerfile
200+--
201+-- TODO: Clean up temp tar.gz file after the image is built
202+buildImageFromDockerfile :: forall m. (MonadIO m, MonadMask m) => BuildOpts -> FilePath -> DockerT m (Either DockerError ())
203+buildImageFromDockerfile opts base = do
204+ ctx <- makeBuildContext $ BuildContextRootDir base
205+ case ctx of
206+ Left e -> return $ Left e
207+ Right c -> requestUnit POST (BuildImageEndpoint opts c)
208+
209+-- | Pulls an image from Docker Hub (by default).
210+--
211+-- TODO: Add support for X-Registry-Auth and pulling from private docker
212+-- registries.
213+--
214+-- TODO: Implement importImage function that uses he same
215+-- CreateImageEndpoint but rather than pulling from docker hub it imports
216+-- the image from a tarball or a URL.
217+pullImage :: forall m b . (MonadIO m, MonadMask m) => T.Text -> Tag -> Sink BS.ByteString m b -> DockerT m (Either DockerError b)
218+pullImage name tag = requestHelper' POST (CreateImageEndpoint name tag Nothing)
219+
220+-- | Creates network
221+createNetwork :: forall m. (MonadIO m, MonadMask m) => CreateNetworkOpts -> DockerT m (Either DockerError NetworkID)
222+createNetwork opts = requestHelper POST (CreateNetworkEndpoint opts) >>= parseResponse
223+
224+-- | Removes a network
225+removeNetwork :: forall m. (MonadIO m, MonadMask m) => NetworkID -> DockerT m (Either DockerError ())
226+removeNetwork nid = requestUnit DELETE $ RemoveNetworkEndpoint nid
227+
src/Docker/Client/Http.hs+87−30
@@ -3,21 +3,28 @@
3
3
4module Docker.Client.Http where
4module Docker.Client.Http where
5
5
6+-- import Control.Monad.Base (MonadBase(..), liftBaseDefault)
7+import Control.Monad.Catch (MonadMask (..))
8+#if MIN_VERSION_http_conduit(2,3,0)
9+import Control.Monad.IO.Unlift (MonadUnliftIO)
10+#endif
6−import Control.Monad.Reader (ReaderT, runReaderT)
11+import Control.Monad.Reader (ReaderT (..), runReaderT)
7import qualified Data.ByteString.Char8 as BSC
12import qualified Data.ByteString.Char8 as BSC
8import qualified Data.ByteString.Lazy as BL
13import qualified Data.ByteString.Lazy as BL
14+import Data.Conduit (Sink)
9import Data.Default.Class (def)
15import Data.Default.Class (def)
10import Data.Monoid ((<>))
16import Data.Monoid ((<>))
11import Data.Text.Encoding (encodeUtf8)
17import Data.Text.Encoding (encodeUtf8)
12import Data.X509 (CertificateChain (..))
18import Data.X509 (CertificateChain (..))
13import Data.X509.CertificateStore (makeCertificateStore)
19import Data.X509.CertificateStore (makeCertificateStore)
14import Data.X509.File (readKeyFile, readSignedObject)
20import Data.X509.File (readKeyFile, readSignedObject)
15−import Network.HTTP.Client (defaultManagerSettings, httpLbs,
21+import Network.HTTP.Client (defaultManagerSettings,
16 managerRawConnection, method,
22 managerRawConnection, method,
17− newManager, parseUrl,
23+ newManager, parseRequest,
18 requestBody, requestHeaders)
24 requestBody, requestHeaders)
19import qualified Network.HTTP.Client as HTTP
25import qualified Network.HTTP.Client as HTTP
20import Network.HTTP.Client.Internal (makeConnection)
26import Network.HTTP.Client.Internal (makeConnection)
27+import qualified Network.HTTP.Simple as NHS
21import Network.HTTP.Types (StdMethod, status101, status200,
28import Network.HTTP.Types (StdMethod, status101, status200,
22 status201, status204)
29 status201, status204)
23import Network.TLS (ClientHooks (..),
30import Network.TLS (ClientHooks (..),
@@ -27,7 +34,7 @@ import Network.TLS (ClientHooks (..),
27import Network.TLS.Extra (ciphersuite_strong)
34import Network.TLS.Extra (ciphersuite_strong)
28import System.X509 (getSystemCertificateStore)
35import System.X509 (getSystemCertificateStore)
29
36
30−import Control.Exception (try)
37+import Control.Monad.Catch (try)
31import Control.Monad.Except
38import Control.Monad.Except
32import Control.Monad.Reader.Class
39import Control.Monad.Reader.Class
33import Data.Text as T
40import Data.Text as T
@@ -38,20 +45,22 @@ import qualified Network.Socket.ByteString as SBS
38
45
39
46
40import Docker.Client.Internal (getEndpoint,
47import Docker.Client.Internal (getEndpoint,
48+ getEndpointContentType,
41 getEndpointRequestBody)
49 getEndpointRequestBody)
42import Docker.Client.Types (DockerClientOpts, Endpoint (..),
50import Docker.Client.Types (DockerClientOpts, Endpoint (..),
43− baseUrl)
51+ apiVer, baseUrl)
44
52
45type Request = HTTP.Request
53type Request = HTTP.Request
46type Response = HTTP.Response BL.ByteString
54type Response = HTTP.Response BL.ByteString
47type HttpVerb = StdMethod
55type HttpVerb = StdMethod
48−type HttpHandler m = Request -> m (Either DockerError Response)
56+newtype HttpHandler m = HttpHandler (forall a . Request -> (HTTP.Response () -> Sink BSC.ByteString m (Either DockerError a)) -> m (Either DockerError a))
49
57
50−data DockerError = DockerConnectionError
58+data DockerError = DockerConnectionError NHS.HttpException
51 | DockerInvalidRequest Endpoint
59 | DockerInvalidRequest Endpoint
60+ | DockerClientError Text
52 | DockerClientDecodeError Text -- ^ Could not parse the response from the Docker endpoint.
61 | DockerClientDecodeError Text -- ^ Could not parse the response from the Docker endpoint.
53 | DockerInvalidStatusCode HTTP.Status -- ^ Invalid exit code received from Docker endpoint.
62 | DockerInvalidStatusCode HTTP.Status -- ^ Invalid exit code received from Docker endpoint.
54− | GenericDockerError Text deriving (Eq, Show, Typeable)
63+ | GenericDockerError Text deriving (Show, Typeable)
55
64
56newtype DockerT m a = DockerT {
65newtype DockerT m a = DockerT {
57 unDockerT :: Monad m => ReaderT (DockerClientOpts, HttpHandler m) m a
66 unDockerT :: Monad m => ReaderT (DockerClientOpts, HttpHandler m) m a
@@ -75,6 +84,9 @@ instance MonadTrans DockerT where
75instance MonadIO m => MonadIO (DockerT m) where
84instance MonadIO m => MonadIO (DockerT m) where
76 liftIO = lift . liftIO
85 liftIO = lift . liftIO
77
86
87+-- instance MonadBase IO m => MonadBase IO (DockerT m) where
88+-- liftBase = liftBaseDefault
89+
78runDockerT :: Monad m => (DockerClientOpts, HttpHandler m) -> DockerT m a -> m a
90runDockerT :: Monad m => (DockerClientOpts, HttpHandler m) -> DockerT m a -> m a
79runDockerT (opts, h) r = runReaderT (unDockerT r) (opts, h)
91runDockerT (opts, h) r = runReaderT (unDockerT r) (opts, h)
80
92
@@ -84,28 +96,41 @@ runDockerT (opts, h) r = runReaderT (unDockerT r) (opts, h)
84-- benefit from testing that on all of our Endpoints
96-- benefit from testing that on all of our Endpoints
85mkHttpRequest :: HttpVerb -> Endpoint -> DockerClientOpts -> Maybe Request
97mkHttpRequest :: HttpVerb -> Endpoint -> DockerClientOpts -> Maybe Request
86mkHttpRequest verb e opts = request
98mkHttpRequest verb e opts = request
87− where fullE = T.unpack (baseUrl opts) ++ T.unpack (getEndpoint e)
99+ where fullE = T.unpack (baseUrl opts) ++ T.unpack (getEndpoint (apiVer opts) e)
88− initialR = parseUrl fullE
100+ initialR = parseRequest fullE
89 request' = case initialR of
101 request' = case initialR of
90 Just ir ->
102 Just ir ->
91 return $ ir {method = (encodeUtf8 . T.pack $ show verb),
103 return $ ir {method = (encodeUtf8 . T.pack $ show verb),
92− requestHeaders = [("Content-Type", "application/json; charset=utf-8")]}
104+ requestHeaders = [("Content-Type", (getEndpointContentType e))]}
93 Nothing -> Nothing
105 Nothing -> Nothing
94− request = (\r -> maybe r (\body -> r {requestBody = HTTP.RequestBodyLBS body,
106+ request = (\r -> maybe r (\body -> r {requestBody = body, -- This will either be a HTTP.RequestBodyLBS or HTTP.RequestBodySourceChunked for the build endpoint
95 requestHeaders = [("Content-Type", "application/json; charset=utf-8")]}) $ getEndpointRequestBody e) <$> request'
107 requestHeaders = [("Content-Type", "application/json; charset=utf-8")]}) $ getEndpointRequestBody e) <$> request'
96 -- Note: Do we need to set length header?
108 -- Note: Do we need to set length header?
97
109
98−defaultHttpHandler :: MonadIO m => HttpHandler m
110+defaultHttpHandler :: (
111+#if MIN_VERSION_http_conduit(2,3,0)
112+ MonadUnliftIO m,
113+#endif
114+ MonadIO m, MonadMask m) => m (HttpHandler m)
99−defaultHttpHandler request = do
115+defaultHttpHandler = do
100 manager <- liftIO $ newManager defaultManagerSettings
116 manager <- liftIO $ newManager defaultManagerSettings
101− httpHandler manager request
117+ return $ httpHandler manager
102−
118+
119+httpHandler :: (
120+#if MIN_VERSION_http_conduit(2,3,0)
121+ MonadUnliftIO m,
122+#endif
103−httpHandler :: MonadIO m => HTTP.Manager -> HttpHandler m
123+ MonadIO m, MonadMask m) => HTTP.Manager -> HttpHandler m
104−httpHandler manager request = liftIO $ do
124+httpHandler manager = HttpHandler $ \request' sink -> do -- runResourceT ..
125+ let request = NHS.setRequestManager manager request'
105− try (httpLbs request manager) >>= \res -> case res of
126+ try (NHS.httpSink request sink) >>= \res -> case res of
106− Right res -> return $ Right res
127+ Right res -> return res
128+#if MIN_VERSION_http_client(0,5,0)
129+ Left e@(HTTP.HttpExceptionRequest _ HTTP.ConnectionFailure{}) -> return $ Left $ DockerConnectionError e
130+#else
107− Left HTTP.FailedConnectionException{} -> return $ Left DockerConnectionError
131+ Left e@HTTP.FailedConnectionException{} -> return $ Left $ DockerConnectionError e
108− Left HTTP.FailedConnectionException2{} -> return $ Left DockerConnectionError
132+ Left e@HTTP.FailedConnectionException2{} -> return $ Left $ DockerConnectionError e
133+#endif
109 Left e -> return $ Left $ GenericDockerError (T.pack $ show e)
134 Left e -> return $ Left $ GenericDockerError (T.pack $ show e)
110
135
111-- | Connect to a unix domain socket (the default docker socket is
136-- | Connect to a unix domain socket (the default docker socket is
@@ -113,13 +138,17 @@ httpHandler manager request = liftIO $ do
113--
138--
114-- Docker seems to ignore the hostname in requests sent over unix domain
139-- Docker seems to ignore the hostname in requests sent over unix domain
115-- sockets (and the port obviously doesn't matter either)
140-- sockets (and the port obviously doesn't matter either)
141+unixHttpHandler :: (
142+#if MIN_VERSION_http_conduit(2,3,0)
143+ MonadUnliftIO m,
144+#endif
116−unixHttpHandler :: MonadIO m => FilePath -- ^ The socket to connect to
145+ MonadIO m, MonadMask m) => FilePath -- ^ The socket to connect to
117− -> HttpHandler m
146+ -> m (HttpHandler m)
118−unixHttpHandler fp request = do
147+unixHttpHandler fp = do
119 let mSettings = defaultManagerSettings
148 let mSettings = defaultManagerSettings
120 { managerRawConnection = return $ openUnixSocket fp}
149 { managerRawConnection = return $ openUnixSocket fp}
121 manager <- liftIO $ newManager mSettings
150 manager <- liftIO $ newManager mSettings
122− httpHandler manager request
151+ return $ httpHandler manager
123
152
124 where
153 where
125 openUnixSocket filePath _ _ _ = do
154 openUnixSocket filePath _ _ _ = do
@@ -127,7 +156,7 @@ unixHttpHandler fp request = do
127 S.connect s (S.SockAddrUnix filePath)
156 S.connect s (S.SockAddrUnix filePath)
128 makeConnection (SBS.recv s 8096)
157 makeConnection (SBS.recv s 8096)
129 (SBS.sendAll s)
158 (SBS.sendAll s)
130− (S.sClose s)
159+ (S.close s)
131
160
132-- TODO:
161-- TODO:
133-- Move this to http-client-tls or network?
162-- Move this to http-client-tls or network?
@@ -179,7 +208,7 @@ statusCodeToError (ListImagesEndpoint _) st =
179 Nothing
208 Nothing
180 else
209 else
181 Just $ DockerInvalidStatusCode st
210 Just $ DockerInvalidStatusCode st
182−statusCodeToError (CreateContainerEndpoint _) st =
211+statusCodeToError (CreateContainerEndpoint _ _) st =
183 if st == status201 then
212 if st == status201 then
184 Nothing
213 Nothing
185 else
214 else
@@ -194,6 +223,11 @@ statusCodeToError (StopContainerEndpoint _ _) st =
194 Nothing
223 Nothing
195 else
224 else
196 Just $ DockerInvalidStatusCode st
225 Just $ DockerInvalidStatusCode st
226+statusCodeToError (WaitContainerEndpoint _) st =
227+ if st == status200 then
228+ Nothing
229+ else
230+ Just $ DockerInvalidStatusCode st
197statusCodeToError (KillContainerEndpoint _ _) st =
231statusCodeToError (KillContainerEndpoint _ _) st =
198 if st == status204 then
232 if st == status204 then
199 Nothing
233 Nothing
@@ -229,5 +263,28 @@ statusCodeToError (InspectContainerEndpoint _) st =
229 Nothing
263 Nothing
230 else
264 else
231 Just $ DockerInvalidStatusCode st
265 Just $ DockerInvalidStatusCode st
232−
266+statusCodeToError (BuildImageEndpoint _ _) st =
233−
267+ if st == status200 then
268+ Nothing
269+ else
270+ Just $ DockerInvalidStatusCode st
271+statusCodeToError (CreateImageEndpoint _ _ _) st =
272+ if st == status200 then
273+ Nothing
274+ else
275+ Just $ DockerInvalidStatusCode st
276+statusCodeToError (DeleteImageEndpoint _ _) st =
277+ if st == status200 then
278+ Nothing
279+ else
280+ Just $ DockerInvalidStatusCode st
281+statusCodeToError (CreateNetworkEndpoint _) st =
282+ if st == status201 then
283+ Nothing
284+ else
285+ Just $ DockerInvalidStatusCode st
286+statusCodeToError (RemoveNetworkEndpoint _) st =
287+ if st == status204 then
288+ Nothing
289+ else
290+ Just $ DockerInvalidStatusCode st
src/Docker/Client/Internal.hs+60−25
@@ -1,14 +1,17 @@
1module Docker.Client.Internal where
1module Docker.Client.Internal where
2
2
3−
4import Blaze.ByteString.Builder (toByteString)
3import Blaze.ByteString.Builder (toByteString)
5import qualified Data.Aeson as JSON
4import qualified Data.Aeson as JSON
6import Data.ByteString (ByteString)
5import Data.ByteString (ByteString)
7−import qualified Data.ByteString.Lazy as BSL
6+import qualified Data.ByteString.Char8 as BSC
7+import qualified Data.Conduit.Binary as CB
8−import Data.Text as T
8+import qualified Data.Text as T
9import Data.Text.Encoding (decodeUtf8, encodeUtf8)
9import Data.Text.Encoding (decodeUtf8, encodeUtf8)
10+import qualified Network.HTTP.Client as HTTP
11+import Network.HTTP.Conduit (requestBodySourceChunked)
10import Network.HTTP.Types (Query, encodePath,
12import Network.HTTP.Types (Query, encodePath,
11 encodePathSegments)
13 encodePathSegments)
14+import Prelude hiding (all)
12
15
13import Docker.Client.Types
16import Docker.Client.Types
14
17
@@ -22,48 +25,68 @@ encodeURLWithQuery ps q = decodeUtf8 $ toByteString $ encodePath ps q
22encodeQ :: String -> ByteString
25encodeQ :: String -> ByteString
23encodeQ = encodeUtf8 . T.pack
26encodeQ = encodeUtf8 . T.pack
24
27
25−getEndpoint :: Endpoint -> T.Text
28+getEndpoint :: ApiVersion -> Endpoint -> T.Text
26−getEndpoint VersionEndpoint = encodeURL ["version"]
29+getEndpoint v VersionEndpoint = encodeURL [v, "version"]
27−getEndpoint (ListContainersEndpoint _) = encodeURL ["containers", "json"] -- Make use of lsOpts here
30+getEndpoint v (ListContainersEndpoint (ListOpts all)) = encodeURLWithQuery [v, "containers", "json"] [("all", Just (encodeQ $ show all))]
28−getEndpoint (ListImagesEndpoint _) = encodeURL ["images", "json"] -- Make use of lsOpts here
31+getEndpoint v (ListImagesEndpoint _) = encodeURL [v, "images", "json"] -- Make use of lsOpts here
29−getEndpoint (CreateContainerEndpoint _) = encodeURL ["containers", "create"]
32+getEndpoint v (CreateContainerEndpoint _ cn) = case cn of
33+ Just cn -> encodeURLWithQuery [v, "containers", "create"] [("name", Just (encodeQ $ T.unpack cn))]
34+ Nothing -> encodeURL [v, "containers", "create"]
30−getEndpoint (StartContainerEndpoint startOpts cid) = encodeURLWithQuery ["containers", fromContainerID cid, "start"] query
35+getEndpoint v (StartContainerEndpoint startOpts cid) = encodeURLWithQuery [v, "containers", fromContainerID cid, "start"] query
31 where query = case (detachKeys startOpts) of
36 where query = case (detachKeys startOpts) of
32 WithCtrl c -> [("detachKeys", Just (encodeQ $ ctrl ++ [c]))]
37 WithCtrl c -> [("detachKeys", Just (encodeQ $ ctrl ++ [c]))]
33 WithoutCtrl c -> [("detachKeys", Just (encodeQ [c]))]
38 WithoutCtrl c -> [("detachKeys", Just (encodeQ [c]))]
34 DefaultDetachKey -> []
39 DefaultDetachKey -> []
35 ctrl = ['c', 't', 'r', 'l', '-']
40 ctrl = ['c', 't', 'r', 'l', '-']
36−getEndpoint (StopContainerEndpoint t cid) = encodeURLWithQuery ["containers", fromContainerID cid, "stop"] query
41+getEndpoint v (StopContainerEndpoint t cid) = encodeURLWithQuery [v, "containers", fromContainerID cid, "stop"] query
37 where query = case t of
42 where query = case t of
38− Timeout x -> [("t", Just (encodeQ $ show x))]
43+ Timeout x -> [("t", Just (encodeQ $ show x))]
39 DefaultTimeout -> []
44 DefaultTimeout -> []
45+getEndpoint v (WaitContainerEndpoint cid) = encodeURL [v, "containers", fromContainerID cid, "wait"]
40−getEndpoint (KillContainerEndpoint s cid) = encodeURLWithQuery ["containers", fromContainerID cid, "kill"] query
46+getEndpoint v (KillContainerEndpoint s cid) = encodeURLWithQuery [v, "containers", fromContainerID cid, "kill"] query
41 where query = case s of
47 where query = case s of
42 SIG x -> [("signal", Just (encodeQ $ show x))]
48 SIG x -> [("signal", Just (encodeQ $ show x))]
43− _ -> [("signal", Just (encodeQ $ show s))]
49+ _ -> [("signal", Just (encodeQ $ show s))]
44−getEndpoint (RestartContainerEndpoint t cid) = encodeURLWithQuery ["containers", fromContainerID cid, "restart"] query
50+getEndpoint v (RestartContainerEndpoint t cid) = encodeURLWithQuery [v, "containers", fromContainerID cid, "restart"] query
45 where query = case t of
51 where query = case t of
46− Timeout x -> [("t", Just (encodeQ $ show x))]
52+ Timeout x -> [("t", Just (encodeQ $ show x))]
47 DefaultTimeout -> []
53 DefaultTimeout -> []
48−getEndpoint (PauseContainerEndpoint cid) = encodeURL ["containers", fromContainerID cid, "pause"]
54+getEndpoint v (PauseContainerEndpoint cid) = encodeURL [v, "containers", fromContainerID cid, "pause"]
49−getEndpoint (UnpauseContainerEndpoint cid) = encodeURL ["containers", fromContainerID cid, "unpause"]
55+getEndpoint v (UnpauseContainerEndpoint cid) = encodeURL [v, "containers", fromContainerID cid, "unpause"]
50-- Make use of since/timestamps/tail logopts here instead of ignoreing them
56-- Make use of since/timestamps/tail logopts here instead of ignoreing them
51−getEndpoint (ContainerLogsEndpoint (LogOpts stdout stderr _ _ _) follow cid) =
57+getEndpoint v (ContainerLogsEndpoint (LogOpts stdout stderr _ _ _) follow cid) =
52− encodeURLWithQuery ["containers", fromContainerID cid, "logs"] query
58+ encodeURLWithQuery [v, "containers", fromContainerID cid, "logs"] query
53 where query = [("stdout", Just (encodeQ $ show stdout)), ("stderr", Just (encodeQ $ show stderr)), ("follow", Just (encodeQ $ show follow))]
59 where query = [("stdout", Just (encodeQ $ show stdout)), ("stderr", Just (encodeQ $ show stderr)), ("follow", Just (encodeQ $ show follow))]
54−getEndpoint (DeleteContainerEndpoint (DeleteOpts removeVolumes force) cid) =
60+getEndpoint v (DeleteContainerEndpoint (ContainerDeleteOpts removeVolumes force) cid) =
55− encodeURLWithQuery ["containers", fromContainerID cid] query
61+ encodeURLWithQuery [v, "containers", fromContainerID cid] query
56 where query = [("v", Just (encodeQ $ show removeVolumes)), ("force", Just (encodeQ $ show force))]
62 where query = [("v", Just (encodeQ $ show removeVolumes)), ("force", Just (encodeQ $ show force))]
57−getEndpoint (InspectContainerEndpoint cid) =
63+getEndpoint v (InspectContainerEndpoint cid) =
58− encodeURLWithQuery ["containers", fromContainerID cid, "json"] []
64+ encodeURLWithQuery [v, "containers", fromContainerID cid, "json"] []
65+getEndpoint v (BuildImageEndpoint o _) = encodeURLWithQuery [v, "build"] query
66+ where query = [("t", Just t), ("dockerfile", Just dockerfile), ("q", Just q), ("nocache", Just nocache), ("rm", Just rm), ("forcerm", Just forcerm), ("pull", Just pull)]
67+ t = encodeQ $ T.unpack $ buildImageName o
68+ dockerfile = encodeQ $ T.unpack $ buildDockerfileName o
69+ q = encodeQ $ show $ buildQuiet o
70+ nocache = encodeQ $ show $ buildNoCache o
71+ rm = encodeQ $ show $ buildRemoveItermediate o
72+ forcerm = encodeQ $ show $ buildForceRemoveIntermediate o
73+ pull = encodeQ $ show $ buildPullParent o
74+getEndpoint v (CreateImageEndpoint name tag _) = encodeURLWithQuery [v, "images", "create"] query
75+ where query = [("fromImage", Just n), ("tag", Just t)]
76+ n = encodeQ $ T.unpack name
77+ t = encodeQ $ T.unpack tag
78+getEndpoint v (DeleteImageEndpoint _ cid) = encodeURL [v, "images", fromImageID cid]
79+getEndpoint v (CreateNetworkEndpoint _) = encodeURL [v, "networks", "create"]
80+getEndpoint v (RemoveNetworkEndpoint nid) = encodeURL [v, "networks", fromNetworkID nid]
59
81
60−getEndpointRequestBody :: Endpoint -> Maybe BSL.ByteString
82+getEndpointRequestBody :: Endpoint -> Maybe HTTP.RequestBody
61getEndpointRequestBody VersionEndpoint = Nothing
83getEndpointRequestBody VersionEndpoint = Nothing
62getEndpointRequestBody (ListContainersEndpoint _) = Nothing
84getEndpointRequestBody (ListContainersEndpoint _) = Nothing
63getEndpointRequestBody (ListImagesEndpoint _) = Nothing
85getEndpointRequestBody (ListImagesEndpoint _) = Nothing
64−getEndpointRequestBody (CreateContainerEndpoint opts) = Just $ JSON.encode opts
86+getEndpointRequestBody (CreateContainerEndpoint opts _) = Just $ HTTP.RequestBodyLBS (JSON.encode opts)
65getEndpointRequestBody (StartContainerEndpoint _ _) = Nothing
87getEndpointRequestBody (StartContainerEndpoint _ _) = Nothing
66getEndpointRequestBody (StopContainerEndpoint _ _) = Nothing
88getEndpointRequestBody (StopContainerEndpoint _ _) = Nothing
89+getEndpointRequestBody (WaitContainerEndpoint _) = Nothing
67getEndpointRequestBody (KillContainerEndpoint _ _) = Nothing
90getEndpointRequestBody (KillContainerEndpoint _ _) = Nothing
68getEndpointRequestBody (RestartContainerEndpoint _ _) = Nothing
91getEndpointRequestBody (RestartContainerEndpoint _ _) = Nothing
69getEndpointRequestBody (PauseContainerEndpoint _) = Nothing
92getEndpointRequestBody (PauseContainerEndpoint _) = Nothing
@@ -71,3 +94,15 @@ getEndpointRequestBody (UnpauseContainerEndpoint _) = Nothing
71getEndpointRequestBody (ContainerLogsEndpoint _ _ _) = Nothing
94getEndpointRequestBody (ContainerLogsEndpoint _ _ _) = Nothing
72getEndpointRequestBody (DeleteContainerEndpoint _ _) = Nothing
95getEndpointRequestBody (DeleteContainerEndpoint _ _) = Nothing
73getEndpointRequestBody (InspectContainerEndpoint _) = Nothing
96getEndpointRequestBody (InspectContainerEndpoint _) = Nothing
97+
98+getEndpointRequestBody (BuildImageEndpoint _ fp) = Just $ requestBodySourceChunked $ CB.sourceFile fp
99+getEndpointRequestBody (CreateImageEndpoint _ _ _) = Nothing
100+getEndpointRequestBody (DeleteImageEndpoint _ _) = Nothing
101+
102+getEndpointRequestBody (CreateNetworkEndpoint opts) = Just $ HTTP.RequestBodyLBS (JSON.encode opts)
103+getEndpointRequestBody (RemoveNetworkEndpoint _) = Nothing
104+
105+getEndpointContentType :: Endpoint -> BSC.ByteString
106+getEndpointContentType (BuildImageEndpoint _ _) = BSC.pack "application/tar"
107+getEndpointContentType _ = BSC.pack "application/json; charset=utf-8"
108+
src/Docker/Client/Types.hs+597−223
@@ -11,7 +11,11 @@ module Docker.Client.Types (
11 , ImageID
11 , ImageID
12 , fromImageID
12 , fromImageID
13 , toImageID
13 , toImageID
14+ , NetworkID
15+ , fromNetworkID
16+ , toNetworkID
14 , Timeout(..)
17 , Timeout(..)
18+ , StatusCode(..)
15 , Signal(..)
19 , Signal(..)
16 , ContainerDetails(..)
20 , ContainerDetails(..)
17 , DockerClientOpts(..)
21 , DockerClientOpts(..)
@@ -22,40 +26,48 @@ module Docker.Client.Types (
22 , ContainerPortInfo(..)
26 , ContainerPortInfo(..)
23 , Container(..)
27 , Container(..)
24 , ContainerState(..)
28 , ContainerState(..)
25− , Status(..)
29+ , State(..)
26 , Digest
30 , Digest
27− , Labels(..)
31+ , Label(..)
28 , Tag
32 , Tag
29 , Image(..)
33 , Image(..)
34+ , Entrypoint(..)
30 , dropImagePrefix
35 , dropImagePrefix
31 , CreateOpts(..)
36 , CreateOpts(..)
37+ , BuildOpts(..)
38+ , defaultBuildOpts
32 , defaultCreateOpts
39 , defaultCreateOpts
33 , DetachKeys(..)
40 , DetachKeys(..)
34 , StartOpts(..)
41 , StartOpts(..)
35 , defaultStartOpts
42 , defaultStartOpts
36− , DeleteOpts(..)
43+ , ContainerDeleteOpts(..)
44+ , defaultContainerDeleteOpts
45+ , ImageDeleteOpts(..)
46+ , defaultImageDeleteOpts
37 , Timestamp
47 , Timestamp
38 , TailLogOpt(..)
48 , TailLogOpt(..)
39 , LogOpts(..)
49 , LogOpts(..)
40 , defaultLogOpts
50 , defaultLogOpts
51+ , CreateNetworkOpts(..)
52+ , defaultCreateNetworkOpts
41 , VolumePermission(..)
53 , VolumePermission(..)
54+ , Bind(..)
42 , Volume(..)
55 , Volume(..)
43 , Device(..)
56 , Device(..)
44 , ContainerName
57 , ContainerName
45 , VolumeFrom(..)
58 , VolumeFrom(..)
46 , Link(..)
59 , Link(..)
47 , LogDriverType(..)
60 , LogDriverType(..)
48− , LogDriverOptions(..)
61+ , LogDriverOption(..)
49 , LogDriverConfig(..)
62 , LogDriverConfig(..)
50 , NetworkMode(..)
63 , NetworkMode(..)
51 , PortType(..)
64 , PortType(..)
52-- , NetworkInterface(..)
65-- , NetworkInterface(..)
53− , Networks(..)
66+ , Network(..)
54 , NetworkSettings(..)
67 , NetworkSettings(..)
55 , NetworkOptions(..)
68 , NetworkOptions(..)
56 , Mount(..)
69 , Mount(..)
57 , PortBinding(..)
70 , PortBinding(..)
58− , PortBindings(..)
59 , HostPort(..)
71 , HostPort(..)
60 , RetryCount
72 , RetryCount
61 , RestartPolicy(..)
73 , RestartPolicy(..)
@@ -63,6 +75,8 @@ module Docker.Client.Types (
63 , UTSMode(..)
75 , UTSMode(..)
64 , HostConfig(..)
76 , HostConfig(..)
65 , defaultHostConfig
77 , defaultHostConfig
78+ , NetworkingConfig(..)
79+ , EndpointConfig(..)
66 , Ulimit(..)
80 , Ulimit(..)
67 , ContainerResources(..)
81 , ContainerResources(..)
68 , defaultContainerResources
82 , defaultContainerResources
@@ -72,9 +86,18 @@ module Docker.Client.Types (
72 , EnvVar(..)
86 , EnvVar(..)
73 , ContainerConfig(..)
87 , ContainerConfig(..)
74 , defaultContainerConfig
88 , defaultContainerConfig
75− , ExposedPorts(..)
89+ , ExposedPort(..)
76 , DeviceWeight(..)
90 , DeviceWeight(..)
77 , DeviceRate(..)
91 , DeviceRate(..)
92+ , addPortBinding
93+ , addExposedPort
94+ , addBind
95+ , setCmd
96+ , addLink
97+ , addVolume
98+ , addVolumeFrom
99+ , MemoryConstraint(..)
100+ , MemoryConstraintSize(..)
78 ) where
101 ) where
79
102
80import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -84,39 +107,57 @@ import qualified Data.Aeson as JSON
84import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
85import Data.Char (isAlphaNum, toUpper)
108import Data.Char (isAlphaNum, toUpper)
86import qualified Data.HashMap.Strict as HM
109import qualified Data.HashMap.Strict as HM
87−import qualified Data.Map as M
88import Data.Monoid ((<>))
110import Data.Monoid ((<>))
111+import Data.Scientific (floatingOrInteger)
89import Data.Text (Text)
112import Data.Text (Text)
90import qualified Data.Text as T
113import qualified Data.Text as T
91import Data.Time.Clock (UTCTime)
114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
92import GHC.Generics (Generic)
116import GHC.Generics (Generic)
93import Prelude hiding (all, tail)
117import Prelude hiding (all, tail)
94import Text.Read (readMaybe)
118import Text.Read (readMaybe)
95
119
120+-- | List of Docker Engine API endpoints
96data Endpoint =
121data Endpoint =
97 VersionEndpoint
122 VersionEndpoint
98 | ListContainersEndpoint ListOpts
123 | ListContainersEndpoint ListOpts
99 | ListImagesEndpoint ListOpts
124 | ListImagesEndpoint ListOpts
100− | CreateContainerEndpoint CreateOpts
125+ | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
101 | StartContainerEndpoint StartOpts ContainerID
126 | StartContainerEndpoint StartOpts ContainerID
102 | StopContainerEndpoint Timeout ContainerID
127 | StopContainerEndpoint Timeout ContainerID
128+ | WaitContainerEndpoint ContainerID
103 | KillContainerEndpoint Signal ContainerID
129 | KillContainerEndpoint Signal ContainerID
104 | RestartContainerEndpoint Timeout ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
105 | PauseContainerEndpoint ContainerID
131 | PauseContainerEndpoint ContainerID
106 | UnpauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
107− | ContainerLogsEndpoint LogOpts Bool ContainerID -- Second argument (Bool) is whether to follow.
133+ | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134+ -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
108− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
109 | InspectContainerEndpoint ContainerID
136 | InspectContainerEndpoint ContainerID
137+ | BuildImageEndpoint BuildOpts FilePath
138+ | CreateImageEndpoint T.Text Tag (Maybe T.Text) -- ^ Either pull an image from docker hub or imports an image from a tarball (or URL)
139+ | DeleteImageEndpoint ImageDeleteOpts ImageID
140+ | CreateNetworkEndpoint CreateNetworkOpts
141+ | RemoveNetworkEndpoint NetworkID
110 deriving (Eq, Show)
142 deriving (Eq, Show)
111
143
144+-- | We should newtype this
112type URL = Text
145type URL = Text
146+
147+-- | We should newtype this
113type ApiVersion = Text
148type ApiVersion = Text
149+
150+
151+-- | ID of a contianer
114newtype ContainerID = ContainerID Text
152newtype ContainerID = ContainerID Text
115 deriving (Eq, Show)
153 deriving (Eq, Show)
116
154
155+-- | Used for extracting the id of the container from the newtype
117fromContainerID :: ContainerID -> Text
156fromContainerID :: ContainerID -> Text
118fromContainerID (ContainerID t) = t
157fromContainerID (ContainerID t) = t
119
158
159+-- | Used for parsing a Text value into a ContainerID. We apply some basic
160+-- validation here.
120toContainerID :: Text -> Maybe ContainerID
161toContainerID :: Text -> Maybe ContainerID
121toContainerID t =
162toContainerID t =
122 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
163 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -124,12 +165,16 @@ toContainerID t =
124 else
165 else
125 Nothing
166 Nothing
126
167
168+-- ID of an image.
127newtype ImageID = ImageID Text
169newtype ImageID = ImageID Text
128 deriving (Eq, Show)
170 deriving (Eq, Show)
129
171
172+-- | Used for extracting the id of the image from the newtype.
130fromImageID :: ImageID -> Text
173fromImageID :: ImageID -> Text
131fromImageID (ImageID t) = t
174fromImageID (ImageID t) = t
132
175
176+-- | Helper function used for parsing a Text value into an ImageID. For now
177+-- just basic validation is used.
133toImageID :: Text -> Maybe ImageID
178toImageID :: Text -> Maybe ImageID
134toImageID t =
179toImageID t =
135 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
180 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -137,9 +182,26 @@ toImageID t =
137 else
182 else
138 Nothing
183 Nothing
139
184
185+-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
140data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
141
187
188+data StatusCode = StatusCode Int
189+
190+instance ToJSON StatusCode where
191+ toJSON (StatusCode c) = object ["StatusCode" .= c]
192+
193+instance FromJSON StatusCode where
194+ parseJSON (JSON.Object o) = do
195+ c <- o .: "StatusCode"
196+ if c >= 0 && c <= 255 then
197+ return (StatusCode c)
198+ else
199+ fail "Unknown exit code"
200+ parseJSON _ = fail "Unknown exit code"
201+
142-- TODO: Add more Signals or use an existing lib
202-- TODO: Add more Signals or use an existing lib
203+-- | Signal used for sending to the process running in the container.
204+-- The default signal is SIGTERM.
143data Signal = SIGHUP
205data Signal = SIGHUP
144 | SIGINT
206 | SIGINT
145 | SIGQUIT
207 | SIGQUIT
@@ -151,16 +213,16 @@ data Signal = SIGHUP
151
213
152instance FromJSON Signal where
214instance FromJSON Signal where
153 parseJSON (JSON.String "SIGTERM") = return SIGTERM
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
154− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
216+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
155− parseJSON (JSON.String "SIGINT") = return SIGINT
217+ parseJSON (JSON.String "SIGINT") = return SIGINT
156 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
157 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
158 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
159− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
160
222
161instance ToJSON Signal where
223instance ToJSON Signal where
162− toJSON SIGHUP = "SIGHUP"
224+ toJSON SIGHUP = "SIGHUP"
163− toJSON SIGINT = "SIGINT"
225+ toJSON SIGINT = "SIGINT"
164 toJSON SIGQUIT = "SIGQUIT"
226 toJSON SIGQUIT = "SIGQUIT"
165 toJSON SIGSTOP = "SIGSTOP"
227 toJSON SIGSTOP = "SIGSTOP"
166 toJSON SIGTERM = "SIGTERM"
228 toJSON SIGTERM = "SIGTERM"
@@ -188,17 +250,19 @@ data ContainerDetails = ContainerDetails {
188 , processLabel :: Text
250 , processLabel :: Text
189 , resolveConfPath :: FilePath
251 , resolveConfPath :: FilePath
190 , restartCount :: Int
252 , restartCount :: Int
191− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
192 , mounts :: [Mount]
254 , mounts :: [Mount]
193 }
255 }
194 deriving (Eq, Show, Generic)
256 deriving (Eq, Show, Generic)
195
257
258+-- | Data type used for parsing the mount information from a container
259+-- list.
196data Mount = Mount {
260data Mount = Mount {
197− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
198 , mountSource :: FilePath
262 , mountSource :: FilePath
199 , mountDestination :: FilePath
263 , mountDestination :: FilePath
200− , mountDriver :: Text
264+ , mountDriver :: Maybe Text
201− , mountMode :: Text -- Note: Improve this?
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
202 , mountRW :: Bool
266 , mountRW :: Bool
203 , mountPropogation :: Text
267 , mountPropogation :: Text
204 }
268 }
@@ -206,16 +270,18 @@ data Mount = Mount {
206
270
207instance FromJSON Mount where
271instance FromJSON Mount where
208 parseJSON (JSON.Object o) = do
272 parseJSON (JSON.Object o) = do
209− name <- o .: "Name"
273+ name <- o .:? "Name"
210 src <- o .: "Source"
274 src <- o .: "Source"
211 dest <- o .: "Destination"
275 dest <- o .: "Destination"
212− driver <- o .: "Driver"
276+ driver <- o .:? "Driver"
213− mode <- o .: "Mode"
277+ -- mode <- o .: "Mode"
214 rw <- o .: "RW"
278 rw <- o .: "RW"
215 prop <- o .: "Propagation"
279 prop <- o .: "Propagation"
216− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
217 parseJSON _ = fail "Mount is not an object"
281 parseJSON _ = fail "Mount is not an object"
218
282
283+-- | Data type used for parsing the container state from a list of
284+-- containers.
219data ContainerState = ContainerState {
285data ContainerState = ContainerState {
220 containerError :: Text
286 containerError :: Text
221 , exitCode :: Int
287 , exitCode :: Int
@@ -227,7 +293,7 @@ data ContainerState = ContainerState {
227 , restarting :: Bool
293 , restarting :: Bool
228 , running :: Bool
294 , running :: Bool
229 , startedAt :: UTCTime
295 , startedAt :: UTCTime
230− , status :: Status
296+ , state :: State
231 }
297 }
232 deriving (Eq, Show, Generic)
298 deriving (Eq, Show, Generic)
233
299
@@ -247,23 +313,30 @@ instance FromJSON ContainerState where
247 return $ ContainerState err exit finished oomKilled dead paused pid restarting running started st
313 return $ ContainerState err exit finished oomKilled dead paused pid restarting running started st
248 parseJSON _ = fail "ContainerState is not an object"
314 parseJSON _ = fail "ContainerState is not an object"
249
315
316+
317+-- | Client options used to configure the remote engine we're talking to
250data DockerClientOpts = DockerClientOpts {
318data DockerClientOpts = DockerClientOpts {
251 apiVer :: ApiVersion
319 apiVer :: ApiVersion
252 , baseUrl :: URL
320 , baseUrl :: URL
253 }
321 }
254 deriving (Eq, Show)
322 deriving (Eq, Show)
255
323
324+-- | Default "DockerClientOpts" used for talking to the docker engine.
256defaultClientOpts :: DockerClientOpts
325defaultClientOpts :: DockerClientOpts
257defaultClientOpts = DockerClientOpts {
326defaultClientOpts = DockerClientOpts {
258 apiVer = "v1.24"
327 apiVer = "v1.24"
259 , baseUrl = "http://127.0.0.1:2375"
328 , baseUrl = "http://127.0.0.1:2375"
260 }
329 }
261
330
331+-- | List options used for filtering the list of container or images.
262data ListOpts = ListOpts { all :: Bool } deriving (Eq, Show)
332data ListOpts = ListOpts { all :: Bool } deriving (Eq, Show)
263
333
334+-- | Default "ListOpts". Doesn't list stopped containers.
264defaultListOpts :: ListOpts
335defaultListOpts :: ListOpts
265defaultListOpts = ListOpts { all=False }
336defaultListOpts = ListOpts { all=False }
266
337
338+-- | Data type used for represneting the version of the docker engine
339+-- remote API.
267data DockerVersion = DockerVersion {
340data DockerVersion = DockerVersion {
268 version :: Text
341 version :: Text
269 , apiVersion :: ApiVersion
342 , apiVersion :: ApiVersion
@@ -333,6 +406,8 @@ instance FromJSON ImageID where
333 return iid
406 return iid
334 parseJSON _ = fail "ImageID is not an object."
407 parseJSON _ = fail "ImageID is not an object."
335
408
409+-- | Data type used for representing the information of various ports that
410+-- a contianer may expose.
336data ContainerPortInfo = ContainerPortInfo {
411data ContainerPortInfo = ContainerPortInfo {
337 ipAddressInfo :: Maybe Text
412 ipAddressInfo :: Maybe Text
338 , privatePortInfo :: Port
413 , privatePortInfo :: Port
@@ -349,6 +424,8 @@ instance FromJSON ContainerPortInfo where
349 parseJSON _ = fail "ContainerPortInfo: Not a JSON object."
424 parseJSON _ = fail "ContainerPortInfo: Not a JSON object."
350
425
351-- For inspecting container details.
426-- For inspecting container details.
427+-- | Data type used for parsing the network information of each container
428+-- when listing them.
352data NetworkOptions = NetworkOptions {
429data NetworkOptions = NetworkOptions {
353-- ipamConfig :: Maybe Text -- Don't see in 1.24
430-- ipamConfig :: Maybe Text -- Don't see in 1.24
354-- , links :: Maybe Text -- Don't see in 1.24
431-- , links :: Maybe Text -- Don't see in 1.24
@@ -378,29 +455,28 @@ instance FromJSON NetworkOptions where
378 return $ NetworkOptions networkId endpointId gateway ip ipLen ip6Gateway globalIP6 globalIP6Len mac
455 return $ NetworkOptions networkId endpointId gateway ip ipLen ip6Gateway globalIP6 globalIP6Len mac
379 parseJSON _ = fail "NetworkOptions is not an object"
456 parseJSON _ = fail "NetworkOptions is not an object"
380
457
381−newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
458+-- TODO: Not sure what this is used for anymore.
459+data Network = Network NetworkMode NetworkOptions
382 deriving (Eq, Show)
460 deriving (Eq, Show)
383
461
384−instance FromJSON Networks where
462+instance {-# OVERLAPPING #-} FromJSON [Network] where
385− parseJSON (JSON.Object o) = do
463+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
386− Networks <$> HM.foldlWithKey' f (return M.empty) o
387−
388 where
464 where
389 f accM k' v' = do
465 f accM k' v' = do
390 acc <- accM
466 acc <- accM
391 k <- parseJSON $ JSON.String k'
467 k <- parseJSON $ JSON.String k'
392 v <- parseJSON v'
468 v <- parseJSON v'
393− return $ M.insert k v acc
469+ return $ (Network k v):acc
394−
395 parseJSON _ = fail "Networks is not an object"
470 parseJSON _ = fail "Networks is not an object"
396
471
472+-- | Data type reprsenting the various network settings a container can have.
397data NetworkSettings = NetworkSettings {
473data NetworkSettings = NetworkSettings {
398 networkSettingsBridge :: Text
474 networkSettingsBridge :: Text
399 , networkSettingsSandboxId :: Text
475 , networkSettingsSandboxId :: Text
400 , networkSettingsHairpinMode :: Bool
476 , networkSettingsHairpinMode :: Bool
401 , networkSettingsLinkLocalIPv6Address :: Text
477 , networkSettingsLinkLocalIPv6Address :: Text
402 , networkSettingsLinkLocalIPv6PrefixLen :: Int
478 , networkSettingsLinkLocalIPv6PrefixLen :: Int
403− , networkSettingsPorts :: PortBindings
479+ , networkSettingsPorts :: [PortBinding]
404 , networkSettingsSandboxKey :: Text
480 , networkSettingsSandboxKey :: Text
405 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
481 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
406 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
482 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
@@ -412,7 +488,7 @@ data NetworkSettings = NetworkSettings {
412 , networkSettingsIpPrefixLen :: Int
488 , networkSettingsIpPrefixLen :: Int
413 , networkSettingsIpv6Gateway :: Text
489 , networkSettingsIpv6Gateway :: Text
414 , networkSettingsMacAddress :: Text
490 , networkSettingsMacAddress :: Text
415− , networkSettingsNetworks :: Networks
491+ , networkSettingsNetworks :: [Network]
416 }
492 }
417 deriving (Eq, Show)
493 deriving (Eq, Show)
418
494
@@ -439,6 +515,7 @@ instance FromJSON NetworkSettings where
439 return $ NetworkSettings bridge sandbox hairpin localIP6 localIP6Len ports sandboxKey secondaryIP secondayIP6 endpointID gateway globalIP6 globalIP6Len ip ipLen ip6Gateway mac networks
515 return $ NetworkSettings bridge sandbox hairpin localIP6 localIP6Len ports sandboxKey secondaryIP secondayIP6 endpointID gateway globalIP6 globalIP6Len ip ipLen ip6Gateway mac networks
440 parseJSON _ = fail "NetworkSettings is not an object."
516 parseJSON _ = fail "NetworkSettings is not an object."
441
517
518+-- | Data type used for parsing a list of containers.
442data Container = Container
519data Container = Container
443 { containerId :: ContainerID
520 { containerId :: ContainerID
444 , containerNames :: [Text]
521 , containerNames :: [Text]
@@ -446,21 +523,23 @@ data Container = Container
446 , containerImageId :: ImageID
523 , containerImageId :: ImageID
447 , containerCommand :: Text
524 , containerCommand :: Text
448 , containerCreatedAt :: Int
525 , containerCreatedAt :: Int
526+ , containerState :: State
449− , containerStatus :: Status
527+ , containerStatus :: Maybe Text
450 , containerPorts :: [ContainerPortInfo]
528 , containerPorts :: [ContainerPortInfo]
451− , containerLabels :: Labels
529+ , containerLabels :: [Label]
452− , containerNetworks :: Networks
530+ , containerNetworks :: [Network]
453 , containerMounts :: [Mount]
531 , containerMounts :: [Mount]
454 } deriving (Show, Eq)
532 } deriving (Show, Eq)
455
533
456instance FromJSON Container where
534instance FromJSON Container where
457− parseJSON (JSON.Object v) =
535+ parseJSON o@(JSON.Object v) =
458− Container <$> (v .: "Id")
536+ Container <$> parseJSON o
459 <*> (v .: "Names")
537 <*> (v .: "Names")
460 <*> (v .: "Image")
538 <*> (v .: "Image")
461− <*> (v .: "ImageID")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
462− <*> (v .: "Command")
540+ <*> (v .: "Command") -- Doesn't exist anymore
463 <*> (v .: "Created")
541 <*> (v .: "Created")
542+ <*> (v .: "State")
464 <*> (v .: "Status")
543 <*> (v .: "Status")
465 <*> (v .: "Ports")
544 <*> (v .: "Ports")
466 <*> (v .: "Labels")
545 <*> (v .: "Labels")
@@ -470,65 +549,124 @@ instance FromJSON Container where
470 parseNetworks (JSON.Object v) =
549 parseNetworks (JSON.Object v) =
471 (v .: "Networks") >>= parseJSON
550 (v .: "Networks") >>= parseJSON
472 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
473−
474 parseJSON _ = fail "Container: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
475
553
554+-- | Represents the state of the container life cycle.
476−data Status = Created | Restarting | Running | Paused | Exited | Dead
555+data State = Created | Restarting | Running | Paused | Exited | Dead
477 deriving (Eq, Show, Generic)
556 deriving (Eq, Show, Generic)
478
557
479−instance FromJSON Status where
558+instance FromJSON State where
480− parseJSON (JSON.String "running") = return Running
559+ parseJSON (JSON.String "running") = return Running
481− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
560+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
482 parseJSON (JSON.String "restarting") = return Restarting
561 parseJSON (JSON.String "restarting") = return Restarting
483− parseJSON (JSON.String "paused") = return Paused
562+ parseJSON (JSON.String "paused") = return Paused
484− parseJSON (JSON.String "exited") = return Exited
563+ parseJSON (JSON.String "exited") = return Exited
485− parseJSON (JSON.String "dead") = return Dead
564+ parseJSON (JSON.String "dead") = return Dead
486− parseJSON _ = fail "Unknown Status"
565+ parseJSON s = fail $ "Unknown Status: " ++ show s
487
566
567+-- | Alias for representing a RepoDigest. We could newtype this and add
568+-- some validation.
488type Digest = Text
569type Digest = Text
489
570
571+-- | Container and Image Labels.
490−newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
572+data Label = Label Name Value deriving (Eq, Show)
573+
491
574
575+-- If there are multiple lables with the same Name in the list
576+-- then the last one wins.
492−instance FromJSON Labels where
577+instance {-# OVERLAPPING #-} ToJSON [Label] where
493− parseJSON val = Labels <$> parseJSON val
578+ toJSON [] = emptyJsonObject
579+ toJSON (l:ls) = toJsonKeyVal (l:ls) key val
580+ where key (Label k _) = T.unpack k
581+ val (Label _ v) = v
494
582
495−instance ToJSON Labels where
583+instance {-# OVERLAPPING #-} FromJSON [Label] where
496− toJSON (Labels kvs) = object [k .= v | (k,v) <- (M.toList kvs)]
584+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
585+ where f accM k v = do
586+ acc <- accM
587+ value <- parseJSON v
588+ return $ (Label k value):acc
589+ parseJSON JSON.Null = return []
590+ parseJSON _ = fail "Failed to parse Labels. Not an object."
497
591
592+-- | Alias for Tags.
498type Tag = Text
593type Tag = Text
499
594
595+-- | Data type used for parsing information from a list of images.
500data Image = DockerImage {
596data Image = DockerImage {
501 imageId :: ImageID
597 imageId :: ImageID
502 , imageCreated :: Integer
598 , imageCreated :: Integer
503 , imageParentId :: Maybe ImageID
599 , imageParentId :: Maybe ImageID
504 , imageRepoTags :: [Tag]
600 , imageRepoTags :: [Tag]
505− , imageRepoDigests :: Maybe [Digest]
601+ , imageRepoDigests :: [Digest]
506 , imageSize :: Integer
602 , imageSize :: Integer
507 , imageVirtualSize :: Integer
603 , imageVirtualSize :: Integer
508− , imageLabels :: Maybe Labels
604+ , imageLabels :: [Label]
509 } deriving (Show, Eq, Generic)
605 } deriving (Show, Eq, Generic)
510
606
607+-- | Helper function used for dropping the "image" prefix when serializing
608+-- the Image data type to and from json.
511dropImagePrefix :: [a] -> [a]
609dropImagePrefix :: [a] -> [a]
512dropImagePrefix = drop 5
610dropImagePrefix = drop 5
513
611
514−instance FromJSON Image where
515− parseJSON = genericParseJSON defaultOptions {
516− fieldLabelModifier = dropImagePrefix}
517
612
613+instance FromJSON Image where
614+ parseJSON (JSON.Object o) = do
615+ imageId <- o .: "Id"
616+ imageCreated <- o .: "Created"
617+ imageParentId <- o .:? "ParentId"
618+ imageRepoTags <- o .:? "RepoTags" .!= []
619+ imageRepoDigests <- o .:? "RepoDigests" .!= []
620+ imageSize <- o .: "Size"
621+ imageVirtualSize <- o .: "VirtualSize"
622+ imageLabels <- o .:? "Labels" .!= []
623+ return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624+ parseJSON _ = fail "Failed to parse DockerImage."
625+
626+-- | Alias for Aliases.
627+type Alias = Text
628+
629+-- | EndpointsConfig is container configuration for a specific network
630+newtype EndpointConfig = EndpointConfig [Alias] deriving (Eq, Show)
631+
632+instance ToJSON EndpointConfig where
633+ toJSON (EndpointConfig aliases) = JSON.object
634+ [ "Aliases" .= aliases
635+ ]
636+
637+-- | Alias for endpoint name
638+type EndpointName = Text
639+
640+-- | Data type for the NetworkingConfig section of the container settings
641+newtype NetworkingConfig = NetworkingConfig
642+ { endpointsConfig :: HM.HashMap EndpointName EndpointConfig
643+ } deriving (Eq, Show)
644+
645+instance ToJSON NetworkingConfig where
646+ toJSON (NetworkingConfig endpointsConfig) = JSON.object
647+ [ "EndpointsConfig" .= endpointsConfig
648+ ]
649+
650+-- | Options used for creating a Container.
518data CreateOpts = CreateOpts {
651data CreateOpts = CreateOpts {
519− containerConfig :: ContainerConfig
652+ containerConfig :: ContainerConfig
520− , hostConfig :: HostConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
521 } deriving (Eq, Show)
655 } deriving (Eq, Show)
522
656
523instance ToJSON CreateOpts where
657instance ToJSON CreateOpts where
524− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
525 let ccJSON = toJSON cc
659 let ccJSON = toJSON cc
526 let hcJSON = toJSON hc
660 let hcJSON = toJSON hc
527 case ccJSON of
661 case ccJSON of
528 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
529− JSON.Object $ HM.insert "HostConfig" hcJSON o
663+ let o1 = HM.insert "HostConfig" hcJSON o
664+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
665+ JSON.Object o2
530 _ -> error "ContainerConfig is not an object." -- This should never happen.
666 _ -> error "ContainerConfig is not an object." -- This should never happen.
531
667
668+-- | Container configuration used for creating a container with sensible
669+-- defaults.
532defaultContainerConfig :: Text -> ContainerConfig
670defaultContainerConfig :: Text -> ContainerConfig
533defaultContainerConfig imageName = ContainerConfig {
671defaultContainerConfig imageName = ContainerConfig {
534 hostname=Nothing
672 hostname=Nothing
@@ -538,28 +676,29 @@ defaultContainerConfig imageName = ContainerConfig {
538 , attachStdout=False
676 , attachStdout=False
539 , image=imageName
677 , image=imageName
540 , attachStderr=False
678 , attachStderr=False
541− , exposedPorts=Nothing -- ExposedPorts M.empty
679+ , exposedPorts=[]
542 , tty=False
680 , tty=False
543 , openStdin=False
681 , openStdin=False
544 , stdinOnce=False
682 , stdinOnce=False
545 , env=[]
683 , env=[]
546 , cmd=[]
684 , cmd=[]
547− , volumes=Nothing
685+ , volumes=[]
548 , workingDir=Nothing
686 , workingDir=Nothing
549− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
550 , networkDisabled=Nothing
688 , networkDisabled=Nothing
551 , macAddress=Nothing
689 , macAddress=Nothing
552− , labels=Nothing
690+ , labels=[]
553 , stopSignal=SIGTERM
691 , stopSignal=SIGTERM
554 }
692 }
555
693
694+-- | Default host confiratuon used for creating a container.
556defaultHostConfig :: HostConfig
695defaultHostConfig :: HostConfig
557defaultHostConfig = HostConfig {
696defaultHostConfig = HostConfig {
558 binds=[]
697 binds=[]
559 , containerIDFile=Nothing
698 , containerIDFile=Nothing
560− , logConfig=LogDriverConfig JsonFile Nothing
699+ , logConfig=LogDriverConfig JsonFile []
561− , networkMode=Bridge
700+ , networkMode=NetworkBridge
562− , portBindings=PortBindings []
701+ , portBindings=[]
563 , restartPolicy=RestartOff
702 , restartPolicy=RestartOff
564 , volumeDriver=Nothing
703 , volumeDriver=Nothing
565 , volumesFrom=[]
704 , volumesFrom=[]
@@ -580,6 +719,7 @@ defaultHostConfig = HostConfig {
580 , resources=defaultContainerResources
719 , resources=defaultContainerResources
581 }
720 }
582
721
722+-- Default container resource contstraints (None).
583defaultContainerResources :: ContainerResources
723defaultContainerResources :: ContainerResources
584defaultContainerResources = ContainerResources {
724defaultContainerResources = ContainerResources {
585 cpuShares=Nothing
725 cpuShares=Nothing
@@ -597,31 +737,80 @@ defaultContainerResources = ContainerResources {
597 , memory=Nothing
737 , memory=Nothing
598 , memoryReservation=Nothing
738 , memoryReservation=Nothing
599 , memorySwap=Nothing
739 , memorySwap=Nothing
600− , oomKillDisable=False
740+ , oomKillDisable=Just False
601 , ulimits=[]
741 , ulimits=[]
602 }
742 }
603
743
604−
744+-- | Default create options when creating a container. You only need to
745+-- specify an image name and the rest is all sensible defaults.
605defaultCreateOpts :: T.Text -> CreateOpts
746defaultCreateOpts :: T.Text -> CreateOpts
747+defaultCreateOpts imageName = CreateOpts
606−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
748+ { containerConfig = defaultContainerConfig imageName
749+ , hostConfig = defaultHostConfig
750+ , networkingConfig = NetworkingConfig HM.empty
751+ }
607
752
608−-- detachKeys – Override the key sequence for detaching a container.
753+-- | Override the key sequence for detaching a container.
609-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
610data DetachKeys = WithCtrl Char | WithoutCtrl Char | DefaultDetachKey deriving (Eq, Show)
755data DetachKeys = WithCtrl Char | WithoutCtrl Char | DefaultDetachKey deriving (Eq, Show)
611
756
757+-- | Options for starting a container.
612data StartOpts = StartOpts { detachKeys :: DetachKeys } deriving (Eq, Show)
758data StartOpts = StartOpts { detachKeys :: DetachKeys } deriving (Eq, Show)
613
759
760+-- | Default options for staring a container.
614defaultStartOpts :: StartOpts
761defaultStartOpts :: StartOpts
615defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
616
763
617−data DeleteOpts = DeleteOpts {
764+-- | Options for deleting a container.
618− deleteVolumes :: Bool
765+data ContainerDeleteOpts = ContainerDeleteOpts {
619− , force :: Bool
766+ deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767+ , force :: Bool -- ^ If the container is still running force deletion anyway.
620 } deriving (Eq, Show)
768 } deriving (Eq, Show)
621
769
770+-- TODO: Add support for container build constraints
771+-- | Options for when building images from a Dockerfile
772+data BuildOpts = BuildOpts {
773+ buildImageName :: Text -- ^ Image name in the form of name:tag; ie. myimage:latest.:w
774+ , buildDockerfileName :: Text -- ^ Name of dockerfile (default: Dockerfile)
775+ , buildQuiet :: Bool
776+ , buildNoCache :: Bool -- ^ Do not use cache when building the image.
777+ , buildRemoveItermediate :: Bool -- ^ Remove intermediate containers after a successful build (default true).
778+ , buildForceRemoveIntermediate :: Bool -- ^ Always remove intermediate containers.
779+ , buildPullParent :: Bool -- ^ Always attempt to pull a newer version of the *parent* image (ie. FROM debian:jessie).
780+ } deriving (Eq, Show)
781+
782+defaultBuildOpts :: Text -> BuildOpts
783+defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
784+ , buildDockerfileName = "Dockerfile"
785+ , buildQuiet = False
786+ , buildNoCache = False
787+ , buildRemoveItermediate = True
788+ , buildForceRemoveIntermediate = False
789+ , buildPullParent = False
790+ }
791+
792+-- | Default options for deleting a container. Most of the time we DON'T
793+-- want to delete the container's volumes or force delete it if it's
794+-- running.
795+defaultContainerDeleteOpts :: ContainerDeleteOpts
796+defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
797+
798+-- | Image delete opts
799+data ImageDeleteOpts = ImageDeleteOpts deriving (Eq, Show)
800+
801+-- | Sane image deletion defaults
802+defaultImageDeleteOpts :: ImageDeleteOpts
803+defaultImageDeleteOpts = ImageDeleteOpts
804+
805+-- | Timestamp alias.
622type Timestamp = Integer
806type Timestamp = Integer
807+
808+-- | Used for requesting N number of lines when tailing a containers log
809+-- output.
623data TailLogOpt = Tail Integer | All deriving (Eq, Show)
810data TailLogOpt = Tail Integer | All deriving (Eq, Show)
624
811
812+
813+-- | Log options used when requesting the log output from a container.
625data LogOpts = LogOpts {
814data LogOpts = LogOpts {
626 stdout :: Bool
815 stdout :: Bool
627 , stderr :: Bool
816 , stderr :: Bool
@@ -630,6 +819,7 @@ data LogOpts = LogOpts {
630 , tail :: TailLogOpt
819 , tail :: TailLogOpt
631 } deriving (Eq, Show)
820 } deriving (Eq, Show)
632
821
822+-- | Sensible default for log options.
633defaultLogOpts :: LogOpts
823defaultLogOpts :: LogOpts
634defaultLogOpts = LogOpts { stdout = True
824defaultLogOpts = LogOpts { stdout = True
635 , stderr = True
825 , stderr = True
@@ -638,37 +828,87 @@ defaultLogOpts = LogOpts { stdout = True
638 , tail = All
828 , tail = All
639 }
829 }
640
830
831+-- | Options for creating a network
832+data CreateNetworkOpts = CreateNetworkOpts
833+ { createNetworkName :: Text -- ^ The network's name
834+ , createNetworkCheckDuplicate :: Bool -- ^ Check for networks with duplicate names.
835+ , createNetworkDriver :: Text -- ^ Name of the network driver plugin to use.
836+ , createNetworkInternal :: Bool -- ^ Restrict external access to the network.
837+ , createNetworkEnableIPv6 :: Bool -- ^ Enable IPv6 on the network.
838+ } deriving (Eq, Show)
839+
840+-- | Sensible defalut for create network options
841+defaultCreateNetworkOpts :: Text -> CreateNetworkOpts
842+defaultCreateNetworkOpts name =
843+ CreateNetworkOpts
844+ { createNetworkName = name
845+ , createNetworkCheckDuplicate = False
846+ , createNetworkDriver = "bridge"
847+ , createNetworkInternal = True
848+ , createNetworkEnableIPv6 = False
849+ }
850+
851+instance ToJSON CreateNetworkOpts where
852+ toJSON opts =
853+ object
854+ [ "Name" .= createNetworkName opts
855+ , "CheckDuplicate" .= createNetworkCheckDuplicate opts
856+ , "Driver" .= createNetworkDriver opts
857+ , "Internal" .= createNetworkInternal opts
858+ , "EnableIPv6" .= createNetworkEnableIPv6 opts
859+ ]
860+
861+-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862+-- | Set permissions on volumes that you mount in the container.
641−data VolumePermission = Rw | Ro deriving (Eq, Show, Generic)
863+data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
642−
864+
643−-- instance ToJSON VolumePermission where
865+instance ToJSON VolumePermission where
644−-- toJSON = error "TODO"
866+ toJSON ReadWrite = "rw"
867+ toJSON ReadOnly = "ro"
868+
645−-- instance FromJSON VolumePermission where
869+instance FromJSON VolumePermission where
646−-- parseJSON = error "TODO"
870+ parseJSON "rw" = return ReadWrite
647−
871+ parseJSON "ro" = return ReadOnly
648−-- Note: Note really sure what this should be (1.24).
872+ parseJSON "RW" = return ReadWrite
649−-- This is not the same as [Volume] in HostConfig.
873+ parseJSON "RO" = return ReadOnly
650−newtype Volumes = Volumes [Text] -- [Volume]
874+ parseJSON _ = fail "Failed to parse VolumePermission"
651− deriving (Eq, Show)
875+
652−
876+-- | Used for marking a directory in the container as "exposed" hence
877+-- taking it outside of the COW filesystem and making it mountable
878+-- in other containers using "VolumesFrom". The volume usually get's
879+-- created somewhere in @/var/lib/docker/volumes@ (depending on the volume
880+-- driver used).
881+-- The CLI example is:
882+--
883+-- @
884+-- docker run --name app -v \/opt\/data -it myapp:latest
885+-- docker run --name app2 --volumes-from app \/bin\/bash -c "ls -l \/opt\/data"
886+-- @
887+newtype Volume = Volume FilePath deriving (Eq, Show)
888+
889+instance {-# OVERLAPPING #-} ToJSON [Volume] where
890+ toJSON [] = emptyJsonObject
891+ toJSON (v:vs) = toJsonKey (v:vs) getKey
892+ where getKey (Volume v) = v
893+
653−instance FromJSON Volumes where
894+instance {-# OVERLAPPING #-} FromJSON [Volume] where
654− parseJSON (JSON.Object o) = return $ Volumes $ HM.keys o
895+ parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
896+ parseJSON (JSON.Null) = return []
655− parseJSON _ = fail "Volumes is not an object"
897+ parseJSON _ = fail "Volume is not an object"
656−
898+
657−instance ToJSON Volumes where
899+
658− toJSON (Volumes vs) = toJSON vs
659−
660−data Volume = Volume { hostSrc :: Text
900+data Bind = Bind { hostSrc :: Text
661− , containerDest :: Text
901+ , containerDest :: Text
662− , volumePermission :: Maybe VolumePermission
902+ , volumePermission :: Maybe VolumePermission
663− } deriving (Eq, Show)
903+ } deriving (Eq, Show)
664
904
665−instance FromJSON Volume where
905+instance FromJSON Bind where
666 parseJSON (JSON.String t) = case T.split (== ':') t of
906 parseJSON (JSON.String t) = case T.split (== ':') t of
667− [src, dest] -> return $ Volume src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
668− [src, dest, "rw"] -> return $ Volume src dest $ Just Rw
908+ [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
669− [src, dest, "ro"] -> return $ Volume src dest $ Just Ro
909+ [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
670− _ -> fail "Could not parse Volume"
910+ _ -> fail "Could not parse Bind"
671− parseJSON _ = fail "Volume is not a string"
911+ parseJSON _ = fail "Bind is not a string"
672
912
673data Device = Device {
913data Device = Device {
674 pathOnHost :: FilePath
914 pathOnHost :: FilePath
@@ -690,19 +930,19 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
690
930
691instance FromJSON VolumeFrom where
931instance FromJSON VolumeFrom where
692 parseJSON (JSON.String t) = case T.split (== ':') t of
932 parseJSON (JSON.String t) = case T.split (== ':') t of
693− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
694− [vol, "rw"] -> return $ VolumeFrom vol $ Just Rw
934+ [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
695− [vol, "ro"] -> return $ VolumeFrom vol $ Just Ro
935+ [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
696− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
697 parseJSON _ = fail "VolumeFrom is not a string"
937 parseJSON _ = fail "VolumeFrom is not a string"
698
938
699instance ToJSON VolumeFrom where
939instance ToJSON VolumeFrom where
700 toJSON (VolumeFrom n p) = case p of
940 toJSON (VolumeFrom n p) = case p of
701− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
702 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
703
943
704−instance ToJSON Volume where
944+instance ToJSON Bind where
705− toJSON (Volume src dest mode) = toJSON $ case mode of
945+ toJSON (Bind src dest mode) = toJSON $ case mode of
706 Nothing -> T.concat[src, ":", dest]
946 Nothing -> T.concat[src, ":", dest]
707 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
947 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
708
948
@@ -710,63 +950,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
710
950
711instance FromJSON Link where
951instance FromJSON Link where
712 parseJSON (JSON.String t) = case T.split (== ':') t of
952 parseJSON (JSON.String t) = case T.split (== ':') t of
713− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
714 [f,s] -> return $ Link f $ Just s
954 [f,s] -> return $ Link f $ Just s
715− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
716 parseJSON _ = fail "Link is not a string"
956 parseJSON _ = fail "Link is not a string"
717
957
718instance ToJSON Link where
958instance ToJSON Link where
719 toJSON (Link n1 n2) = toJSON $ case n2 of
959 toJSON (Link n1 n2) = toJSON $ case n2 of
720 Nothing -> T.concat[n1, ":", n1] -- use same name in container
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
721− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
722
962
723-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
724data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
725
965
726instance FromJSON LogDriverType where
966instance FromJSON LogDriverType where
727 parseJSON (JSON.String "json-file") = return JsonFile
967 parseJSON (JSON.String "json-file") = return JsonFile
728− parseJSON (JSON.String "syslog") = return Syslog
968+ parseJSON (JSON.String "syslog") = return Syslog
729− parseJSON (JSON.String "journald") = return Journald
969+ parseJSON (JSON.String "journald") = return Journald
730− parseJSON (JSON.String "gelf") = return Gelf
970+ parseJSON (JSON.String "gelf") = return Gelf
731− parseJSON (JSON.String "fluentd") = return Fluentd
971+ parseJSON (JSON.String "fluentd") = return Fluentd
732− parseJSON (JSON.String "awslogs") = return AwsLogs
972+ parseJSON (JSON.String "awslogs") = return AwsLogs
733− parseJSON (JSON.String "splunk") = return Splunk
973+ parseJSON (JSON.String "splunk") = return Splunk
734− parseJSON (JSON.String "etwlogs") = return Etwlogs
974+ parseJSON (JSON.String "etwlogs") = return Etwlogs
735− parseJSON (JSON.String "none") = return LoggingDisabled
975+ parseJSON (JSON.String "none") = return LoggingDisabled
736− parseJSON _ = fail "Unknown LogDriverType"
976+ parseJSON _ = fail "Unknown LogDriverType"
737
977
738instance ToJSON LogDriverType where
978instance ToJSON LogDriverType where
739− toJSON JsonFile = JSON.String "json-file"
979+ toJSON JsonFile = JSON.String "json-file"
740− toJSON Syslog = JSON.String "syslog"
980+ toJSON Syslog = JSON.String "syslog"
741− toJSON Journald = JSON.String "journald"
981+ toJSON Journald = JSON.String "journald"
742− toJSON Gelf = JSON.String "gelf"
982+ toJSON Gelf = JSON.String "gelf"
743− toJSON Fluentd = JSON.String "fluentd"
983+ toJSON Fluentd = JSON.String "fluentd"
744− toJSON AwsLogs = JSON.String "awslogs"
984+ toJSON AwsLogs = JSON.String "awslogs"
745− toJSON Splunk = JSON.String "splunk"
985+ toJSON Splunk = JSON.String "splunk"
746− toJSON Etwlogs = JSON.String "etwlogs"
986+ toJSON Etwlogs = JSON.String "etwlogs"
747 toJSON LoggingDisabled = JSON.String "none"
987 toJSON LoggingDisabled = JSON.String "none"
748
988
749−newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
989+data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
750
990
751−instance FromJSON LogDriverOptions where
991+instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
752− parseJSON (JSON.Object o) = do
992+ toJSON [] = emptyJsonObject
753− LogDriverOptions <$> HM.foldlWithKey' f (return M.empty) o
993+ toJSON (o:os) = toJsonKeyVal (o:os) key val
994+ where key (LogDriverOption n _) = T.unpack n
995+ val (LogDriverOption _ v) = v
754
996
755− where
997+instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
998+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
756− f accM k (JSON.String v) = do
999+ where f accM k v = do
757 acc <- accM
1000 acc <- accM
758− return $ M.insert k v acc
1001+ value <- parseJSON v
759− f _ _ _ = fail "Value of LogDriverOptions is not a string"
1002+ return $ (LogDriverOption k value):acc
760−
761− parseJSON JSON.Null = return $ LogDriverOptions M.empty
1003+ parseJSON JSON.Null = return []
762− parseJSON _ = fail "LogDriverOptions is not an object"
763−
764−instance ToJSON LogDriverOptions where
765− toJSON (LogDriverOptions mp) = toJSON mp
1004+ parseJSON _ = fail "Failed to parse LogDriverOptions"
766
1005
767−data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1006+data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
768
1007
769instance ToJSON LogDriverConfig where
1008instance ToJSON LogDriverConfig where
1009+ toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
770 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
1010 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
771
1011
772instance FromJSON LogDriverConfig where
1012instance FromJSON LogDriverConfig where
@@ -777,21 +1017,47 @@ instance FromJSON LogDriverConfig where
777 parseJSON _ = fail "LogDriverConfig is not an object"
1017 parseJSON _ = fail "LogDriverConfig is not an object"
778
1018
779-- TODO: Add container:<name|id> mode
1019-- TODO: Add container:<name|id> mode
780−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
781 deriving (Eq, Show, Ord)
1021 deriving (Eq, Show, Ord)
782
1022
783instance FromJSON NetworkMode where
1023instance FromJSON NetworkMode where
784− parseJSON (JSON.String "bridge") = return Bridge
1024+ parseJSON (JSON.String "bridge") = return NetworkBridge
785− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1025+ parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
786− parseJSON (JSON.String "none") = return NetworkDisabled
1026+ parseJSON (JSON.String "none") = return NetworkDisabled
1027+ parseJSON (JSON.String n) = return $ NetworkNamed n
787− parseJSON _ = fail "Unknown NetworkMode"
1028+ parseJSON _ = fail "Unknown NetworkMode"
788
1029
789instance ToJSON NetworkMode where
1030instance ToJSON NetworkMode where
790− toJSON Bridge = JSON.String "bridge"
1031+ toJSON NetworkBridge = JSON.String "bridge"
791− toJSON Host = JSON.String "host"
1032+ toJSON NetworkHost = JSON.String "host"
792 toJSON NetworkDisabled = JSON.String "none"
1033 toJSON NetworkDisabled = JSON.String "none"
1034+ toJSON (NetworkNamed n) = JSON.String n
793
1035
1036+newtype NetworkID = NetworkID Text
1037+ deriving (Eq, Show)
1038+
1039+-- | Used for extracting the id of the container from the newtype
1040+fromNetworkID :: NetworkID -> Text
1041+fromNetworkID (NetworkID t) = t
1042+
1043+-- | Used for parsing a Text value into a NetworkID.
1044+toNetworkID :: Text -> Maybe NetworkID
1045+toNetworkID t = Just $ NetworkID t
1046+
1047+instance FromJSON NetworkID where
1048+ parseJSON (JSON.Object o) = do
1049+ nid <- o .: "Id"
1050+ return $ NetworkID nid
1051+ parseJSON _ = fail "NetworkID is not an object."
1052+
1053+instance ToJSON NetworkID where
1054+ toJSON (NetworkID nid) = object ["Id" .= nid]
1055+
794−data PortType = TCP | UDP deriving (Eq, Show, Generic, Read, Ord)
1056+data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057+
1058+instance Show PortType where
1059+ show TCP = "tcp"
1060+ show UDP = "udp"
795
1061
796instance ToJSON PortType where
1062instance ToJSON PortType where
797 toJSON TCP = "tcp"
1063 toJSON TCP = "tcp"
@@ -801,7 +1067,7 @@ instance FromJSON PortType where
801 parseJSON val = case val of
1067 parseJSON val = case val of
802 "tcp" -> return TCP
1068 "tcp" -> return TCP
803 "udp" -> return UDP
1069 "udp" -> return UDP
804− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
805
1071
806-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
807--
1073--
@@ -816,9 +1082,8 @@ instance FromJSON PortType where
816-- host system s that the service running in the container can be accessed from
1082-- host system s that the service running in the container can be accessed from
817-- the outside world. We either map a port onto all interfaces (default) or onto a specific
1083-- the outside world. We either map a port onto all interfaces (default) or onto a specific
818-- interface like `127.0.0.1`.
1084-- interface like `127.0.0.1`.
819−newtype PortBindings = PortBindings [PortBinding]
1085+-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
820− deriving (Eq, Show)
1086+-- instance will only send the last one.
821−
822-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
1087-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
823data PortBinding = PortBinding {
1088data PortBinding = PortBinding {
824 containerPort :: Port
1089 containerPort :: Port
@@ -826,17 +1091,65 @@ data PortBinding = PortBinding {
826 , hostPorts :: [HostPort]
1091 , hostPorts :: [HostPort]
827 } deriving (Eq, Show)
1092 } deriving (Eq, Show)
828
1093
829−
830portAndType2Text :: Port -> PortType -> Text
1094portAndType2Text :: Port -> PortType -> Text
831portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
1095portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
832
1096
833−instance ToJSON PortBinding where
834− toJSON (PortBinding {..}) = object [portAndType2Text containerPort portType .= hostPorts]
835−
836−instance FromJSON PortBindings where
837− parseJSON (JSON.Object o) = do
838− PortBindings <$> HM.foldlWithKey' f (return []) o
839
1097
1098+-- | A helper function to more easily add a bind mount to existing
1099+-- "CreateOpts" records.
1100+addBind :: Bind -> CreateOpts -> CreateOpts
1101+addBind b c = c{hostConfig=hc{binds=obs <> [b]}}
1102+ where hc = hostConfig c
1103+ obs = binds $ hostConfig c
1104+
1105+-- | Helper function for adding a Command to and existing
1106+-- CreateOpts record.
1107+setCmd :: Text -> CreateOpts -> CreateOpts
1108+setCmd ccmd c = c{containerConfig=cc{cmd=[ccmd]}}
1109+ where cc = containerConfig c
1110+
1111+-- | Helper function for adding a "Link" to and existing
1112+-- CreateOpts record.
1113+addLink :: Link -> CreateOpts -> CreateOpts
1114+addLink l c = c{hostConfig=hc{links=ols <> [l]}}
1115+ where hc = hostConfig c
1116+ ols = links $ hostConfig c
1117+
1118+-- | Helper function for adding a "Volume" to and existing
1119+-- CreateOpts record.
1120+addVolume :: Volume -> CreateOpts -> CreateOpts
1121+addVolume v c = c{containerConfig=cc{volumes=oldvs <> [v]}}
1122+ where cc = containerConfig c
1123+ oldvs = volumes cc
1124+
1125+-- | Helper function for adding a "VolumeFrom" to and existing
1126+-- CreateOpts record.
1127+addVolumeFrom :: VolumeFrom -> CreateOpts -> CreateOpts
1128+addVolumeFrom vf c = c{hostConfig=hc{volumesFrom=oldvfs <> [vf]}}
1129+ where hc = hostConfig c
1130+ oldvfs = volumesFrom hc
1131+
1132+-- | A convenience function that adds PortBindings to and exiting
1133+-- "CreateOpts" record. Useful with 'defaultCreateOpts'
1134+-- Example:
1135+--
1136+-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
1137+-- >>> addPortBinding pb $ defaultCreateOpts "nginx:latest"
1138+addPortBinding :: PortBinding -> CreateOpts -> CreateOpts
1139+addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
1140+ where hc = hostConfig c
1141+ pbs = portBindings $ hostConfig c
1142+
1143+-- | Helper function for adding a "ExposedPort" to and existing
1144+-- CreateOpts record.
1145+addExposedPort :: ExposedPort -> CreateOpts -> CreateOpts
1146+addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
1147+ where cc = containerConfig c
1148+ oldeps = exposedPorts cc
1149+
1150+
1151+instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1152+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
840 where
1153 where
841 f accM k v = case T.split (== '/') k of
1154 f accM k v = case T.split (== '/') k of
842 [port', portType'] -> do
1155 [port', portType'] -> do
@@ -845,13 +1158,15 @@ instance FromJSON PortBindings where
845 acc <- accM
1158 acc <- accM
846 hps <- parseJSON v
1159 hps <- parseJSON v
847 return $ (PortBinding port portType hps):acc
1160 return $ (PortBinding port portType hps):acc
848− _ ->
849− fail "Could not parse PortBindings"
1161+ _ -> fail "Could not parse PortBindings"
1162+ parseJSON (JSON.Null) = return []
850 parseJSON _ = fail "PortBindings is not an object"
1163 parseJSON _ = fail "PortBindings is not an object"
851
1164
852−instance ToJSON PortBindings where
1165+instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
853− toJSON (PortBindings []) = JSON.Object HM.empty
1166+ toJSON [] = emptyJsonObject
854− toJSON (PortBindings (p:ps)) = toJSON (p:ps)
1167+ toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1168+ where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1169+ val p = hostPorts p
855
1170
856data HostPort = HostPort {
1171data HostPort = HostPort {
857 hostIp :: Text
1172 hostIp :: Text
@@ -869,24 +1184,6 @@ instance FromJSON HostPort where
869 return $ HostPort i p
1184 return $ HostPort i p
870 parseJSON _ = fail "HostPort is not an object."
1185 parseJSON _ = fail "HostPort is not an object."
871
1186
872−-- newtype HostPorts = HostPorts [HostPort]
873−-- deriving (Eq, Show)
874−--
875−-- instance ToJSON HostPorts where
876−-- toJSON (HostPorts hps) = toJSON hps
877−--
878−-- instance FromJSON HostPorts where
879−-- parseJSON (JSON.Object o) = do
880−-- HostPorts <$> HM.foldlWithKey' f (return []) o
881−--
882−-- where
883−-- f accM k v = do
884−-- acc <- accM
885−-- p' <- parseJSON v
886−-- p <- parseIntegerText p'
887−-- return $ (HostPort (NetworkInterface k) p):acc
888−-- parseJSON _ = fail $ "HostPorts is not an object"
889−
890-- { "Name": "on-failure" , "MaximumRetryCount": 2}
1187-- { "Name": "on-failure" , "MaximumRetryCount": 2}
891type RetryCount = Integer
1188type RetryCount = Integer
892data RestartPolicy = RestartAlways | RestartUnlessStopped | RestartOnFailure RetryCount | RestartOff deriving (Eq, Show)
1189data RestartPolicy = RestartAlways | RestartUnlessStopped | RestartOnFailure RetryCount | RestartOff deriving (Eq, Show)
@@ -900,7 +1197,7 @@ instance FromJSON RestartPolicy where
900 "on-failure" -> do
1197 "on-failure" -> do
901 retry <- o .: "MaximumRetryCount"
1198 retry <- o .: "MaximumRetryCount"
902 return $ RestartOnFailure retry
1199 return $ RestartOnFailure retry
903− "off" -> return RestartOff
1200+ "no" -> return RestartOff
904 _ -> fail "Could not parse RestartPolicy"
1201 _ -> fail "Could not parse RestartPolicy"
905 parseJSON _ = fail "RestartPolicy is not an object"
1202 parseJSON _ = fail "RestartPolicy is not an object"
906
1203
@@ -908,7 +1205,7 @@ instance ToJSON RestartPolicy where
908 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
909 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
910 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
911− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
912
1209
913data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
914
1211
@@ -918,11 +1215,11 @@ newtype UTSMode = UTSMode Text deriving (Eq, Show)
918-- TODO: Add UTSMode : UTS namespace to use for the container
1215-- TODO: Add UTSMode : UTS namespace to use for the container
919-- TODO: Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
1216-- TODO: Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
920data HostConfig = HostConfig
1217data HostConfig = HostConfig
921− { binds :: [Volume]
1218+ { binds :: [Bind]
922 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
1219 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
923 , logConfig :: LogDriverConfig
1220 , logConfig :: LogDriverConfig
924 , networkMode :: NetworkMode
1221 , networkMode :: NetworkMode
925− , portBindings :: PortBindings
1222+ , portBindings :: [PortBinding]
926 , restartPolicy :: RestartPolicy
1223 , restartPolicy :: RestartPolicy
927 , volumeDriver :: Maybe Text
1224 , volumeDriver :: Maybe Text
928 , volumesFrom :: [VolumeFrom]
1225 , volumesFrom :: [VolumeFrom]
@@ -1081,6 +1378,22 @@ instance ToJSON DeviceRate where
1081 , "Rate" .= r
1378 , "Rate" .= r
1082 ]
1379 ]
1083
1380
1381+data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
1382+
1383+data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1384+
1385+instance ToJSON MemoryConstraint where
1386+ toJSON (MemoryConstraint x B) = toJSON x
1387+ toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
1388+ toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
1389+
1390+instance FromJSON MemoryConstraint where
1391+ parseJSON (JSON.Number x) = case (floatingOrInteger x) of
1392+ Left (_ :: Double) -> fail "Failed to parse MemoryConstraint"
1393+ Right i -> return $ MemoryConstraint i B
1394+ -- The docker daemon will always return the number as bytes (integer), regardless of how we set them (using MB or GB)
1395+ parseJSON _ = fail "Failed to parse MemoryConstraint"
1396+
1084data ContainerResources = ContainerResources {
1397data ContainerResources = ContainerResources {
1085 cpuShares :: Maybe Integer
1398 cpuShares :: Maybe Integer
1086 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
1399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1096,12 +1409,12 @@ data ContainerResources = ContainerResources {
1096 , cpusetMems :: Maybe Text
1409 , cpusetMems :: Maybe Text
1097 , devices :: [Device]
1410 , devices :: [Device]
1098 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1099− , kernelMemory :: Maybe Integer
1412+ , kernelMemory :: Maybe MemoryConstraint
1100− , memory :: Maybe Integer
1413+ , memory :: Maybe MemoryConstraint
1101− , memoryReservation :: Maybe Integer
1414+ , memoryReservation :: Maybe MemoryConstraint
1102− , memorySwap :: Maybe Integer
1415+ , memorySwap :: Maybe MemoryConstraint
1103 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1104− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
1105 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1106 , ulimits :: [Ulimit]
1419 , ulimits :: [Ulimit]
1107 -- TODO: Missing from 1.24
1420 -- TODO: Missing from 1.24
@@ -1139,41 +1452,59 @@ instance FromJSON EnvVar where
1139 parseJSON _ = fail "EnvVar is not a string"
1452 parseJSON _ = fail "EnvVar is not a string"
1140
1453
1141instance ToJSON EnvVar where
1454instance ToJSON EnvVar where
1142− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1143
1456
1144−-- | ExposedPorts represent a enumeraton of all the ports (and their type)
1457+-- | ExposedPort represents a port (and it's type)
1145-- that a container should expose to other containers or the host system.
1458-- that a container should expose to other containers or the host system.
1146−-- `NOTE`: This does not automatically expose the ports onto the host
1459+-- `NOTE`: This does not automatically expose the port onto the host
1147−-- system but rather it just tags them. It's best to be used with
1460+-- system but rather it just tags it. It's best to be used with
1148-- the PublishAllPorts flag. It is also useful for
1461-- the PublishAllPorts flag. It is also useful for
1149-- the daemon to know which Environment variables to
1462-- the daemon to know which Environment variables to
1150-- inject into a container linking to our container.
1463-- inject into a container linking to our container.
1151-- Example linking a Postgres container named db would inject the following
1464-- Example linking a Postgres container named db would inject the following
1152-- environment variables automatically if we set the corresponding
1465-- environment variables automatically if we set the corresponding
1153−-- ExposedPorts:
1466+--
1467+-- ExposedPort:
1468+--
1469+-- @
1154-- DB_PORT_5432_TCP_PORT="5432"
1470-- DB_PORT_5432_TCP_PORT="5432"
1155-- DB_PORT_5432_TCP_PROTO="tcp"
1471-- DB_PORT_5432_TCP_PROTO="tcp"
1156-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1472-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1473+-- @
1157−newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1474+data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1158−-- JP: Should this be ExposedPorts [(Port, PortType)]?
1159−
1160−instance FromJSON ExposedPorts where
1161− parseJSON (JSON.Object o) = do
1162− ExposedPorts <$> HM.foldlWithKey' f (return M.empty) o
1163
1475
1476+instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1477+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1164 where
1478 where
1165 f accM k _ = case T.split (== '/') k of
1479 f accM k _ = case T.split (== '/') k of
1166 [port', portType'] -> do
1480 [port', portType'] -> do
1167 port <- parseIntegerText port'
1481 port <- parseIntegerText port'
1168 portType <- parseJSON $ JSON.String portType'
1482 portType <- parseJSON $ JSON.String portType'
1169 acc <- accM
1483 acc <- accM
1170− return $ M.insert port portType acc
1484+ return $ (ExposedPort port portType):acc
1171− _ ->
1172− fail "Could not parse ExposedPorts"
1485+ _ -> fail "Could not parse ExposedPorts"
1486+ parseJSON (JSON.Null) = return []
1173− parseJSON _ = fail "ExposedPorts is not an object."
1487+ parseJSON _ = fail "ExposedPorts is not an object"
1488+
1489+instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1490+ toJSON [] = emptyJsonObject
1491+ toJSON (p:ps) = toJsonKey (p:ps) key
1492+ where key (ExposedPort p t) = show p <> slash <> show t
1493+ slash = T.unpack "/"
1494+
1495+data Entrypoint = Entrypoint [T.Text] deriving (Eq, Show, Generic)
1174
1496
1175−instance ToJSON ExposedPorts where
1497+instance ToJSON Entrypoint where
1176− toJSON (ExposedPorts kvs) = object [((T.pack $ show p) <> "/" <> (T.pack $ show t)) .= JSON.Object HM.empty | (p,t) <- (M.toList kvs)]
1498+ toJSON (Entrypoint (e:es)) = toJSON (e:es)
1499+ toJSON (Entrypoint []) = JSON.Null
1500+
1501+instance FromJSON Entrypoint where
1502+ parseJSON (JSON.String e) = return $ Entrypoint [e]
1503+ parseJSON (JSON.Array ar) = do
1504+ arr <- mapM parseJSON (V.toList ar)
1505+ return $ Entrypoint arr
1506+ parseJSON JSON.Null = return $ Entrypoint []
1507+ parseJSON _ = fail "Failed to parse Entrypoint"
1177
1508
1178
1509
1179data ContainerConfig = ContainerConfig {
1510data ContainerConfig = ContainerConfig {
@@ -1183,7 +1514,7 @@ data ContainerConfig = ContainerConfig {
1183 , attachStdin :: Bool
1514 , attachStdin :: Bool
1184 , attachStdout :: Bool
1515 , attachStdout :: Bool
1185 , attachStderr :: Bool
1516 , attachStderr :: Bool
1186− , exposedPorts :: Maybe ExposedPorts -- Note: Should we expand the JSON instance and take away the Maybe?
1517+ , exposedPorts :: [ExposedPort]
1187 -- , publishService :: Text -- Don't see this in 1.24
1518 -- , publishService :: Text -- Don't see this in 1.24
1188 , tty :: Bool
1519 , tty :: Bool
1189 , openStdin :: Bool
1520 , openStdin :: Bool
@@ -1192,27 +1523,70 @@ data ContainerConfig = ContainerConfig {
1192 , cmd :: [Text]
1523 , cmd :: [Text]
1193 -- , argsEscaped :: Bool -- Don't see this in 1.24
1524 -- , argsEscaped :: Bool -- Don't see this in 1.24
1194 , image :: Text
1525 , image :: Text
1195− , volumes :: Maybe Volumes
1526+ , volumes :: [Volume]
1196 , workingDir :: Maybe FilePath
1527 , workingDir :: Maybe FilePath
1197− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
1198 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1199 , macAddress :: Maybe Text
1530 , macAddress :: Maybe Text
1200 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1201− , labels :: Maybe Labels
1532+ , labels :: [Label]
1202 , stopSignal :: Signal
1533 , stopSignal :: Signal
1203 } deriving (Eq, Show, Generic)
1534 } deriving (Eq, Show, Generic)
1204
1535
1536+
1205instance ToJSON ContainerConfig where
1537instance ToJSON ContainerConfig where
1206 toJSON = genericToJSON defaultOptions {
1538 toJSON = genericToJSON defaultOptions {
1207 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1208
1540
1209instance FromJSON ContainerConfig where
1541instance FromJSON ContainerConfig where
1210− parseJSON = genericParseJSON defaultOptions {
1542+ parseJSON (JSON.Object o) = do
1211− fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1543+ hostname <- o .:? "Hostname"
1544+ domainname <- o .:? "Domainname"
1545+ user <- o .:? "User"
1546+ attachStdin <- o .: "AttachStdin"
1547+ attachStdout <- o .: "AttachStdout"
1548+ attachStderr <- o .: "AttachStderr"
1549+ exposedPorts <- o .:? "ExposedPorts" .!= []
1550+ tty <- o .: "Tty"
1551+ openStdin <- o .: "OpenStdin"
1552+ stdinOnce <- o .: "StdinOnce"
1553+ env <- o .: "Env"
1554+ cmd <- o .: "Cmd"
1555+ image <- o .: "Image"
1556+ volumes <- o .: "Volumes"
1557+ workingDir <- o .:? "WorkingDir"
1558+ entrypoint <- o .: "Entrypoint"
1559+ networkDisabled <- o .:? "networkDisabled"
1560+ macAddress <- o .:? "MacAddress"
1561+ labels <- o .:? "Labels" .!= []
1562+ stopSignal <- o .: "StopSignal"
1563+ return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1564+ macAddress labels stopSignal
1565+ parseJSON _ = fail "NetworkSettings is not an object."
1212
1566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
1213parseIntegerText :: (Monad m) => Text -> m Integer
1570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
1214parseIntegerText t = case readMaybe $ T.unpack t of
1572parseIntegerText t = case readMaybe $ T.unpack t of
1215 Nothing ->
1573 Nothing ->
1216 fail "Could not parse Integer"
1574 fail "Could not parse Integer"
1217 Just i ->
1575 Just i ->
1218 return i
1576 return i
1577+
1578+-- | Helper function for converting a data type [a] to a json dictionary
1579+-- like so {"something": {}, "something2": {}}
1580+toJsonKey :: Foldable t => t a -> (a -> String) -> JSON.Value
1581+toJsonKey vs getKey = JSON.Object $ foldl f HM.empty vs
1582+ where f acc x = HM.insert (T.pack $ getKey x) (JSON.Object HM.empty) acc
1583+
1584+-- | Helper function for converting a data type [a] to a json dictionary
1585+-- like so {"something": "val1", "something2": "val2"}
1586+toJsonKeyVal :: (Foldable t, JSON.ToJSON r) => t a -> (a -> String) -> (a -> r) -> JSON.Value
1587+toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1588+ where f acc x = HM.insert (T.pack $ getKey x) (toJSON $ getVal x) acc
1589+
1590+-- | Helper function that return an empty dictionary "{}"
1591+emptyJsonObject :: JSON.Value
1592+emptyJsonObject = JSON.Object HM.empty
src/Docker/Client/Utils.hsnew file+131
@@ -0,0 +1,131 @@
1+{-# LANGUAGE ExplicitForAll #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE ScopedTypeVariables #-}
4+
5+
6+module Docker.Client.Utils where
7+
8+import qualified Codec.Archive.Tar as Tar
9+import qualified Codec.Compression.GZip as GZip
10+import Control.Monad (filterM, liftM, unless)
11+import Control.Monad.IO.Class
12+import qualified Data.ByteString.Lazy as BS
13+import Data.Monoid ((<>))
14+import qualified Data.Text as T
15+import qualified Data.Text.IO as TIO
16+import qualified Data.UUID as UUID
17+import qualified Data.UUID.V4 as UUID
18+import System.Directory (doesDirectoryExist, doesFileExist,
19+ getTemporaryDirectory)
20+import System.FilePath (isAbsolute, makeRelative, (</>))
21+import System.FilePath.Find (FilterPredicate,
22+ RecursionPredicate, always,
23+ fileName, find, (==?))
24+import System.FilePath.GlobPattern ((~~))
25+import System.IO.Error (tryIOError)
26+-- import System.IO.Temp (withSystemTempDirectory)
27+--
28+import Docker.Client.Http
29+
30+type File = FilePath
31+data DirTree = DirTree [File] [DirTree]
32+
33+
34+newtype ExclusionPattern = ExclusionPattern T.Text deriving (Eq, Show)
35+newtype InclusionPattern = InclusionPattern T.Text deriving (Eq, Show)
36+
37+data DockerIgnore = DockerIgnore { exclusionPatterns :: [ExclusionPattern]
38+ , inclusionPatterns :: [InclusionPattern]
39+ } deriving (Eq, Show)
40+
41+newtype BuildContextRootDir = BuildContextRootDir FilePath deriving (Eq, Show)
42+
43+makeBuildContext :: forall m. MonadIO m => BuildContextRootDir -> m (Either DockerError FilePath)
44+makeBuildContext base = liftIO $ tryIOError (makeBuildContext' base) >>= \res -> case res of
45+ Left e -> return $ Left $ DockerClientError (T.pack $ show e)
46+ Right c -> return $ Right c
47+
48+makeBuildContext' :: forall m. MonadIO m => BuildContextRootDir -> m FilePath
49+makeBuildContext' (BuildContextRootDir base) = do
50+ uuid <- liftIO UUID.nextRandom
51+ fs <- liftIO $ getBuildContext $ BuildContextRootDir base
52+ let relFs = map (makeRelative base) fs
53+ tmpDir <- liftIO getTemporaryDirectory
54+ let tmpF = tmpDir </> "docker.context-" <> UUID.toString uuid <> ".tar.gz"
55+ liftIO $ BS.writeFile tmpF . GZip.compress . Tar.write =<< Tar.pack base relFs
56+ return tmpF
57+
58+parseDockerIgnoreFile :: T.Text -> DockerIgnore
59+parseDockerIgnoreFile c = DockerIgnore{ exclusionPatterns=parseExclusions
60+ , inclusionPatterns=parseInclusions}
61+ where lines = filter (not . T.isPrefixOf "#") (T.lines c) -- Ignore comments
62+ parseExclusions = map ExclusionPattern $ filter (\l -> not (T.isPrefixOf "!" l) && (l /= "")) lines
63+ parseInclusions = map (InclusionPattern . T.drop 1) $ filter (\l -> T.isPrefixOf "!" l && (l /= "")) lines
64+
65+getBuildContext :: BuildContextRootDir -> IO [FilePath]
66+getBuildContext (BuildContextRootDir base) = do
67+ -- The base dir needs to be a path to a directory and not a path to
68+ -- a file
69+ exists <- doesDirectoryExist base
70+ let abs = isAbsolute base
71+ unless (exists && abs) $ fail "Path to context needs to be a directory that: exists, is readable, and is an absolute path."
72+ di <- find always (fileName ==? ".dockerignore") base
73+ dockerignore <- case di of
74+ [] -> return $ DockerIgnore [] []
75+ -- This should not return more than one result though
76+ (x:_) -> do
77+ c <- TIO.readFile x
78+ return $ parseDockerIgnoreFile c
79+ -- This will traverse the directory recursively
80+ fs <- find (shouldRecurse dockerignore) (shouldInclude dockerignore) base
81+ -- fs is a list of directories *and* files in those directories. So
82+ -- an example result would look like ["/tmp/project/files",
83+ -- "/tmp/project/files/file1.txt"] and we want just the individual
84+ -- files otherwise tar duplicates them when making the archive.
85+ fs' <- filterM doesFileExist fs
86+ -- For some reason base is in there as well and we don't need that
87+ return $ filter (not . (==) base) fs'
88+
89+shouldInclude :: DockerIgnore -> FilterPredicate
90+shouldInclude d = check `liftM` fileName
91+ where check f = dockerIgnoreDecision (exclusionCheck f (exclusionPatterns d), inclusionCheck f (inclusionPatterns d))
92+
93+shouldRecurse :: DockerIgnore -> RecursionPredicate
94+shouldRecurse d = check `liftM` fileName
95+ where check f = dockerIgnoreDecision (exclusionCheck f (exclusionPatterns d), inclusionCheck f (inclusionPatterns d))
96+
97+-- TODO: We don't handle precedence rules. For instance a dockerignore file
98+-- like this:
99+--
100+-- *.md
101+-- !README*.md
102+-- README-secret.md
103+--
104+-- Should result in no markdown files being included in the context except README files other
105+-- than README-secret.md. FIXME: OUR implementation would in fact include
106+-- README-secret.md as well!!!
107+--
108+-- Whereas this:
109+--
110+-- *.md
111+-- README-secret.md
112+-- !README*.md
113+--
114+-- Should result in all of the README files being included. The middle line has no effect
115+-- because !README*.md matches README-secret.md and comes last. Our
116+-- implementation will result in the same thing.
117+dockerIgnoreDecision :: (Bool, Bool) -> Bool
118+dockerIgnoreDecision p = case p of
119+ -- If it's in any of the exclusion patterns but also
120+ -- in any of the inclusion patterns then laeave it
121+ (True, True) -> True
122+ (True, False) -> False
123+ (False, True) -> True
124+ (False, False) -> True
125+
126+exclusionCheck :: FilePath -> [ExclusionPattern] -> Bool
127+exclusionCheck f ps = any id (map (\(ExclusionPattern p) -> f ~~ T.unpack p) ps)
128+
129+inclusionCheck :: FilePath -> [InclusionPattern] -> Bool
130+inclusionCheck f ps = any id (map (\(InclusionPattern p) -> f ~~ T.unpack p) ps)
131+
stack-7.10.yamlnew file+32
@@ -0,0 +1,32 @@
1+# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
2+
3+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4+resolver: lts-6.30
5+
6+# Local packages, usually specified by relative directory name
7+packages:
8+- '.'
9+
10+# Override default flag values for local packages and extra-deps
11+flags: {}
12+
13+# Extra package databases containing global packages
14+extra-deps:
15+- directory-1.2.7.0
16+- unliftio-core-0.1.1.0
17+- process-1.6.5.1
18+
19+# Control whether we use the GHC we find on the path
20+# system-ghc: true
21+
22+# Require a specific version of stack, using version ranges
23+# require-stack-version: -any # Default
24+# require-stack-version: >= 0.1.4.0
25+
26+# Override the architecture used by stack, especially useful on Windows
27+# arch: i386
28+# arch: x86_64
29+
30+# Extra directories used by stack for building
31+# extra-include-dirs: [/path/to/dir]
32+# extra-lib-dirs: [/path/to/dir]
stack-8.0.2.yamlnew file+4
@@ -0,0 +1,4 @@
1+resolver: lts-9.4
2+packages:
3+- '.'
4+extra-deps: []
stack-8.0.yamlnew file+5
@@ -0,0 +1,5 @@
1+resolver: lts-7.12
2+packages:
3+- '.'
4+extra-deps:
5+- unliftio-core-0.1.1.0
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: []
5+
stack.yamlmode 100644 → 120000+1−32
@@ -1,32 +0,0 @@
1−# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
2−
3−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4−resolver: lts-5.18
5−
6−# Local packages, usually specified by relative directory name
7−packages:
8−- '.'
9−
10−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11−extra-deps: []
12−
13−# Override default flag values for local packages and extra-deps
14−flags: {}
15−
16−# Extra package databases containing global packages
17−extra-package-dbs: []
18−
19−# Control whether we use the GHC we find on the path
20−# system-ghc: true
21−
22−# Require a specific version of stack, using version ranges
23−# require-stack-version: -any # Default
24−# require-stack-version: >= 0.1.4.0
25−
26−# Override the architecture used by stack, especially useful on Windows
27−# arch: i386
28−# arch: x86_64
29−
30−# Extra directories used by stack for building
31−# extra-include-dirs: [/path/to/dir]
32−# extra-lib-dirs: [/path/to/dir]
@@ -0,0 +1 @@
1+stack-8.6.4.yaml
tests/Dockerfile+1−1
@@ -1,4 +1,4 @@
1FROM debian:jessie
1FROM debian:jessie
2
2
3−CMD ["/bin/bash", "-c", "echo 123"]
3+CMD ["/bin/bash", "-c", "echo $TEST"]
4
4
tests/tests.hs+241−55
@@ -2,6 +2,8 @@
2
2
3module Main where
3module Main where
4
4
5+import Data.Either (rights)
6+import Prelude hiding (all)
5import qualified Test.QuickCheck.Monadic as QCM
7import qualified Test.QuickCheck.Monadic as QCM
6import Test.Tasty
8import Test.Tasty
7import Test.Tasty.HUnit
9import Test.Tasty.HUnit
@@ -9,100 +11,284 @@ import Test.Tasty.QuickCheck (testProperty)
9
11
10import Control.Concurrent (threadDelay)
12import Control.Concurrent (threadDelay)
11import Control.Lens ((^.), (^?))
13import Control.Lens ((^.), (^?))
14+import Control.Monad (forM_)
12import Control.Monad.IO.Class
15import Control.Monad.IO.Class
13−import Control.Monad.Trans.Class (MonadTrans, lift)
16+import Control.Monad.Trans.Class (lift)
14import qualified Data.Aeson as JSON
17import qualified Data.Aeson as JSON
15−import Data.Aeson.Lens (key, _Object, _String, _Value)
18+import Data.Aeson ((.=))
19+import Data.Aeson.Lens (key, _Array, _Null, _Object,
20+ _String, _Value)
16import qualified Data.ByteString as B
21import qualified Data.ByteString as B
17import qualified Data.ByteString.Char8 as C
22import qualified Data.ByteString.Char8 as C
18import qualified Data.ByteString.Lazy as BL
23import qualified Data.ByteString.Lazy as BL
19import qualified Data.HashMap.Strict as HM
24import qualified Data.HashMap.Strict as HM
20import Data.Int (Int)
25import Data.Int (Int)
21import qualified Data.Map as M
26import qualified Data.Map as M
22−import Data.Maybe (fromJust, isJust)
27+import Data.Maybe (fromJust, isJust, isNothing, listToMaybe)
23import Data.Monoid
28import Data.Monoid
24import Data.Text (Text, unpack)
29import Data.Text (Text, unpack)
30+import qualified Data.Vector as V
25import Network.Connection (TLSSettings (..))
31import Network.Connection (TLSSettings (..))
26import Network.HTTP.Client (newManager)
32import Network.HTTP.Client (newManager)
27import Network.HTTP.Client.TLS
33import Network.HTTP.Client.TLS
28import Network.HTTP.Types.Status
34import Network.HTTP.Types.Status
35+import System.Directory (getCurrentDirectory)
36+import System.Environment (lookupEnv)
29import System.Process (system)
37import System.Process (system)
30
38
31−import Docker
39+import Docker.Client
32
40
33-- opts = defaultClientOpts
41-- opts = defaultClientOpts
34−
35−testImageName = "docker-hs-test"
42+testImageName = "docker-hs/test"
43+imageToDeleteFullName = "hello-world:latest"
36
44
37toStrict1 = B.concat . BL.toChunks
45toStrict1 = B.concat . BL.toChunks
38
46
39−runDocker f = do
47+runDocker f
40− -- let opts = defaultClientOpts {baseUrl = "https://127.0.0.1:2376/"}
48+ -- let opts = defaultClientOpts {baseUrl = "https://127.0.0.1:2376/"}
41− -- params' <- clientParamsWithClientAuthentication "127.0.0.1" 2376 "~/.docker/test-client-key.pem" "~/.docker/test-client-cert.pem" >>= fromRight
49+ -- params' <- clientParamsWithClientAuthentication "127.0.0.1" 2376 "~/.docker/test-client-key.pem" "~/.docker/test-client-cert.pem" >>= fromRight
42− -- params <- clientParamsSetCA params' "~/.docker/test-ca.pem"
50+ -- params <- clientParamsSetCA params' "~/.docker/test-ca.pem"
43− -- let settings = mkManagerSettings (TLSSettings params) Nothing
51+ -- let settings = mkManagerSettings (TLSSettings params) Nothing
44− -- mgr <- newManager settings
52+ -- mgr <- newManager settings
53+ = do
54+ h <- defaultHttpHandler
45− runDockerT (defaultClientOpts, defaultHttpHandler) f
55+ runDockerT (defaultClientOpts, h) f
46
56
47testDockerVersion :: IO ()
57testDockerVersion :: IO ()
48−testDockerVersion = runDocker $ do
58+testDockerVersion =
59+ runDocker $
49− v <- getDockerVersion
60+ do v <- getDockerVersion
50− lift $ assert $ isRight v
61+ lift $ assert $ isRight v
62+
63+testStopNonexisting :: IO ()
64+testStopNonexisting = runDocker $ do
65+ res <- stopContainer DefaultTimeout $ fromJust $ toContainerID "thisshouldnotexist"
66+ lift $ assert $ isLeft res
51
67
52testFindImage :: IO ()
68testFindImage :: IO ()
53−testFindImage = runDocker $ do
69+testFindImage =
70+ runDocker $
54− images <- listImages defaultListOpts >>= fromRight
71+ do images <- listImages defaultListOpts >>= fromRight
55− let x = filter ((== [testImageName<>":latest"]) . imageRepoTags) images
72+ let xs = filter (elem imageFullName . imageRepoTags) images
56− lift $ assert $ length x == 1
73+ lift $ assert $ length xs == 1
74+ where
75+ imageFullName = testImageName <> ":latest"
76+
77+testDeleteImage :: IO ()
78+testDeleteImage = runDocker $ do
79+ img <- fmap fromJust findTestImage
80+ result <- deleteImage defaultImageDeleteOpts (imageId img)
81+ lift $ assert $ isRight result
82+ maybeTestImageAfter <- findTestImage
83+ lift $ assert $ isNothing maybeTestImageAfter
84+ where
85+ findTestImage =
86+ do
87+ images <- listImages defaultListOpts >>= fromRight
88+ return $ listToMaybe
89+ $ filter (elem imageToDeleteFullName . imageRepoTags) images
90+
91+testListContainers :: IO ()
92+testListContainers =
93+ runDocker $
94+ do containerId <- createContainer (defaultCreateOpts (testImageName <> ":latest")) Nothing
95+ c <- fromRight containerId
96+ res <- listContainers $ ListOpts { all=True }
97+ deleteContainer (ContainerDeleteOpts True True) c
98+ lift $ assert $ isRight res
99+
100+testBuildFromDockerfile :: IO ()
101+testBuildFromDockerfile = do
102+ cur <- getCurrentDirectory
103+ let ctxDir = cur ++ "/tests"
104+ runDocker $ do
105+ r <- buildImageFromDockerfile (defaultBuildOpts "docker-hs/dockerfile-test") ctxDir
106+ lift $ assert $ isRight r
107+
57
108
58testRunAndReadLog :: IO ()
109testRunAndReadLog :: IO ()
110+testRunAndReadLog = testRunAndReadLogHelper $ NetworkingConfig HM.empty
111+
112+testRunAndReadLogWithNetworking :: IO ()
113+testRunAndReadLogWithNetworking = testRunAndReadLogHelper $ NetworkingConfig $ HM.fromList [("test-network", EndpointConfig ["cellar-door"])]
114+
115+testRunAndReadLogHelper :: NetworkingConfig -> IO ()
116+testRunAndReadLogHelper networkingConfig =
59−testRunAndReadLog = runDocker $ do
117+ runDocker $
60− containerId <- createContainer (defaultCreateOpts (testImageName <> ":latest"))
118+ do let containerConfig = (defaultContainerConfig (testImageName <> ":latest")) {env = [EnvVar "TEST" "123"]}
119+ createdNetworks <- rights <$> mapM createNetworkWithName networkNames
120+ containerId <- createContainer (CreateOpts containerConfig defaultHostConfig networkingConfig) Nothing
61− c <- fromRight containerId
121+ c <- fromRight containerId
62− status1 <- startContainer defaultStartOpts c
122+ status1 <- startContainer defaultStartOpts c
63− _ <- inspectContainer c >>= fromRight
123+ _ <- inspectContainer c >>= fromRight
64− lift $ threadDelay 300000 -- give 300ms for the application to finish
124+ lift $ threadDelay 300000 -- give 300ms for the application to finish
65− lift $ assert $ status1 == Right ()
125+ lift $ assertBool ("starting the container, unexpected status: " ++ show status1) $ isRightUnit status1
66− status2 <- killContainer SIGTERM c
67− logs <- getContainerLogs defaultLogOpts c >>= fromRight
126+ logs <- getContainerLogs defaultLogOpts c >>= fromRight
68− lift $ assert $ status2 == Right ()
69− lift $ assert $ (C.pack "123") `C.isInfixOf` (toStrict1 logs)
127+ lift $ assert $ (C.pack "123") `C.isInfixOf` (toStrict1 logs)
70− status3 <- deleteContainer (DeleteOpts True True) c
128+ status3 <- deleteContainer (ContainerDeleteOpts True True) c
71− lift $ assert $ status3 == Right ()
129+ lift $ assertBool ("deleting container, unexpected status: " ++ show status3) $ isRightUnit status3
72−
130+ mapM_ removeNetwork createdNetworks
73−
74−sampleEP = ExposedPorts $ M.fromList [(80, TCP), (1337, UDP)]
75−
76−testExposedPorts :: TestTree
77−testExposedPorts = testGroup "Testing ExposedPorts JSON" [ testTCP, testUDP ]
78− where
131+ where
79− testTCP = testCase "tcp port" $ assert $ JSON.toJSON sampleEP ^. key "80/tcp" . _Object == HM.empty
132+ isRightUnit (Right ()) = True
80− testUDP = testCase "udp port" $ assert $ JSON.toJSON sampleEP ^. key "1337/tcp" . _Object == HM.empty
133+ isRightUnit _ = False
134+ networkNames = HM.keys $ endpointsConfig networkingConfig
135+ createNetworkWithName name = createNetwork $
136+ (defaultCreateNetworkOpts name) { createNetworkCheckDuplicate = True }
137+
138+testCreateRemoveNetwork :: IO ()
139+testCreateRemoveNetwork = do
140+ runDocker $ do
141+ createStatus <- createNetwork $ defaultCreateNetworkOpts "test-network"
142+ lift $ assertBool ("creating a network, unexpected status: " ++ show createStatus) $ isRight createStatus
143+ nid <- fromRight createStatus
144+ removeStatus <- removeNetwork nid
145+ lift $ assertBool ("removing a network, unexpected status: " ++ show removeStatus) $ isRight removeStatus
81
146
147+testLogDriverOptionsJson :: TestTree
148+testLogDriverOptionsJson = testGroup "Testing LogDriverOptions JSON" [test1, test2, test3]
149+ where
150+ test1 = testCase "Driver option 1" $ assert $ JSON.toJSON sample ^. key key1 . _String == val1
151+ test2 = testCase "Driver option 2" $ assert $ JSON.toJSON sample ^. key key2 . _String == val2
152+ test3 =
153+ testCase "Test override" $ assert $ JSON.toJSON sample2 ^. key key1 . _String == "override"
154+ sample = [LogDriverOption key1 val1, LogDriverOption key2 val2]
155+ sample2 = [LogDriverOption key1 val1, LogDriverOption key1 "override"]
156+ key1 = "some-key"
157+ val1 = "some-val"
158+ key2 = "some-key2"
159+ val2 = "some-key2"
160+
161+testExposedPortsJson :: TestTree
162+testExposedPortsJson = testGroup "Testing ExposedPorts JSON" [testTCP, testUDP]
163+ where
164+ testTCP = testCase "tcp port" $ assert $ JSON.toJSON sampleEP ^. key "80/tcp" . _Object == HM.empty
165+ testUDP =
166+ testCase "udp port" $ assert $ JSON.toJSON sampleEP ^. key "1337/tcp" . _Object == HM.empty
167+ sampleEP = [ExposedPort 80 TCP, ExposedPort 1337 UDP]
168+
169+testLabelsJson :: TestTree
170+testLabelsJson = testGroup "Testing Labels JSON" [testLS1, testLS2, testOverride]
171+ where
172+ testLS1 = testCase "test label key1" $ assert $ JSON.toJSON sampleLS ^. key key1 . _String == val1
173+ testLS2 = testCase "test label key2" $ assert $ JSON.toJSON sampleLS ^. key key2 . _String == val2
174+ testOverride =
175+ testCase "test label override" $ assert $ JSON.toJSON [Label key1 val1, Label key1 "override"] ^.
176+ key key1 .
177+ _String ==
178+ "override"
179+ sampleLS = [Label key1 val1, Label key2 val2]
180+ key1 = "com.example.some-label"
181+ val1 = "some-value"
182+ key2 = "something"
183+ val2 = "value"
184+
185+testVolumesJson :: TestTree
186+testVolumesJson = testGroup "Testing Volumes JSON" [testSample1, testSample2]
187+ where
188+ testSample1 =
189+ testCase "Test exposing volume: /tmp" $ assert $ JSON.toJSON sampleVolumes ^. key "/tmp" . _Object ==
190+ HM.empty
191+ testSample2 =
192+ testCase "Test exposing volume: /opt" $ assert $ JSON.toJSON sampleVolumes ^. key "/opt" . _Object ==
193+ HM.empty
194+ sampleVolumes = [Volume "/tmp", Volume "/opt"]
195+
196+testEntrypointJson :: TestTree
197+testEntrypointJson = testGroup "Testing ContainerConfig JSON" [testSample1, testSample2, testSample3, testSample4, testSample5]
198+ where
199+ testSample1 =
200+ testCase "Test toJSON with empty entrypoint (null)" $ assert $ JSON.toJSON (Entrypoint []) ^. _Null == ()
201+ testSample2 =
202+ testCase "Test toJSON with entrypoint as Array" $ assert $
203+ JSON.toJSON (Entrypoint sampleEntrypointArr) ==
204+ JSON.toJSON sampleEntrypointArr
205+ testSample3 =
206+ testCase "Test decoding entrypoint as string" $ assert $ (JSON.decode "\"cmd\"") ==
207+ Just (Entrypoint ["cmd"])
208+ testSample4 =
209+ testCase "Test decoding as null" $ assert $ (JSON.decode "null" :: Maybe Entrypoint) ==
210+ Just (Entrypoint [])
211+ testSample5 =
212+ testCase "Test decoding as array" $ assert $ (JSON.decode (JSON.encode sampleEntrypointArr) :: Maybe Entrypoint) ==
213+ Just (Entrypoint sampleEntrypointArr)
214+ sampleEntrypointArr = ["cmd", "--some-flag", "--some-flag2"]
215+
216+testEnvVarJson :: TestTree
217+testEnvVarJson = testGroup "Testing EnvVar JSON" [testSampleEncode, testSampleDecode]
218+ where
219+ testSampleEncode =
220+ testCase "Test toJSON" $ assert $ JSON.toJSON (EnvVar "cellar" "door") == JSON.String "cellar=door"
221+ testSampleDecode =
222+ testCase "Test fromJSON" $ assert $ (JSON.decode "\"cellar=door\"" :: Maybe EnvVar) ==
223+ Just (EnvVar "cellar" "door")
224+
225+testNetworkingConfigJson :: TestTree
226+testNetworkingConfigJson = testGroup "Testing NetworkingConfig JSON" [testSampleEncode]
227+ where
228+ testSampleEncode =
229+ let networkingConfig = NetworkingConfig $ HM.fromList [("custom-network", EndpointConfig ["cellar", "door"])]
230+ in testCase "Test toJSON" $ assert $ JSON.toJSON networkingConfig ==
231+ JSON.object
232+ [ "EndpointsConfig" .= JSON.object
233+ [ "custom-network" .= JSON.object
234+ [ "Aliases" .= (["cellar", "door"] :: [Text])
235+ ]
236+ ]
237+ ]
82
238
83integrationTests :: TestTree
239integrationTests :: TestTree
84−integrationTests = testGroup "Integration Tests" [
240+integrationTests =
241+ testGroup
242+ "Integration Tests"
85− testCase "Get docker version" testDockerVersion,
243+ [ testCase "Get docker version" testDockerVersion
244+ , testCase "Build image from Dockerfile" testBuildFromDockerfile
86− testCase "Find image by name" testFindImage,
245+ , testCase "Find image by name" testFindImage
246+ , testCase "Delete image" testDeleteImage
247+ , testCase "List containers" testListContainers
87− testCase "Run a dummy container and read its log" testRunAndReadLog]
248+ , testCase "Run a dummy container and read its log" testRunAndReadLog
249+ , testCase "Run a dummy container with networking and read its log" testRunAndReadLogWithNetworking
250+ , testCase "Try to stop a container that doesn't exist" testStopNonexisting
251+ , testCase "Create and remove a network" testCreateRemoveNetwork
252+ ]
88
253
89jsonTests :: TestTree
254jsonTests :: TestTree
90−jsonTests = testGroup "JSON Tests" [testExposedPorts]
255+jsonTests =
256+ testGroup
257+ "JSON Tests"
258+ [ testExposedPortsJson
259+ , testVolumesJson
260+ , testLabelsJson
261+ , testLogDriverOptionsJson
262+ , testEntrypointJson
263+ , testEnvVarJson
264+ , testNetworkingConfigJson
265+ ]
91
266
92setup :: IO ()
267setup :: IO ()
268+setup =
269+ mapM_ system
270+ [ "docker pull " ++ unpack imageToDeleteFullName
93−setup = system ("docker build -t "++unpack testImageName++" tests") >> return ()
271+ , "docker build -t " ++ unpack testImageName ++ " tests"
272+ ]
94
273
274+isLeft = not . isRight
275+
95−isRight (Left _) = False
276+isRight (Left _) = False
96isRight (Right _) = True
277isRight (Right _) = True
97
278
279+fromRight
98−fromRight :: (MonadIO m, Show l) => Either l r -> m r
280+ :: (MonadIO m, Show l)
281+ => Either l r -> m r
99fromRight (Left l) = do
282fromRight (Left l) = do
100− liftIO $ assertFailure $ "Left: " ++ show l
283+ liftIO $ assertFailure $ "Left: " ++ show l
101− undefined
284+ undefined
102fromRight (Right r) = return r
285fromRight (Right r) = return r
103
286
104main :: IO ()
287main :: IO ()
105main = do
288main = do
289+ stackage <- lookupEnv "RUN_INTEGRATION_TESTS"
290+ case stackage of
291+ Nothing -> defaultMain $ testGroup "Tests" [jsonTests]
292+ Just _ -> do
106− setup
293+ setup
107− defaultMain $ testGroup "Tests" [jsonTests, integrationTests]
294+ defaultMain $ testGroup "Tests" [jsonTests, integrationTests]
108−