Commit Graph

312 Commits

Author SHA1 Message Date
James Parker
8b702f3335 apparently we need to expand out all combinations by hand 2018-01-06 22:44:02 -05:00
James Parker
d68c37ffd9 try again 2018-01-06 22:32:29 -05:00
James Parker
0fb91a3874 test against different docker versions 2018-01-06 22:13:08 -05:00
DaQuirm
a21b3497c8 Fix EnvVar JSON encoding 2018-01-06 23:40:14 +01:00
Daniel Schoepe
6f060289c0 Better debugging information when failing to parse status 2017-12-22 16:52:44 +01:00
Daniel Schoepe
14ddb2fcb1 Make "Name" attribute on mounts optional 2017-12-22 16:52:29 +01:00
Daniel Schoepe
4f193468cc Parse status information from correct field 2017-12-22 16:52:05 +01:00
Daniel Schoepe
77b8e71312 Parse Id value properly in FromJSON instance for Containers
This should fix the main issue causing #46
2017-12-22 16:51:19 +01:00
Deni Bertovic
d7e30423b4 WIP fixed listing containers 2017-12-14 16:34:03 +01:00
James Parker
e78f6251c0 Fix for ContainerId parsing from listContainers #46 2017-11-24 00:48:11 +01:00
Deni Bertovic
0751b704bd Add test for listing containers
We have to start a container before running this test
since it will pass regardless if there are no containers
2017-11-24 00:47:54 +01:00
James Parker
00942075e5 Fix for ContainerId parsing from listContainers #46 2017-11-16 17:48:04 -05:00
Deni Bertovic
966b66de03 Adds integration test
for building image from Dockerfile
2017-11-01 12:29:05 +01:00
Deni Bertovic
023e717707 Adds info about integration tests to makefile 2017-11-01 12:28:29 +01:00
Sven Koschnicke
6ed5b5890e fixed log test
trying to kill a container which is not running leads to a "409 Conflict" error
from the docker API. The container in the test should have already stopped, no
need to kill it. A bug in the requestUnit method prevented the test from failing
before.
2017-11-01 11:39:56 +01:00
Deni Bertovic
b4c6a2b929 Merge remote-tracking branch 'jprider63/master' 2017-11-01 11:37:38 +01:00
Deni Bertovic
5cac8a0c73
Merge pull request #42 from SKoschnicke/master
added reference to docs and examples in readme
2017-11-01 11:26:07 +01:00
Deni Bertovic
4fd3af2294
Merge pull request #40 from SKoschnicke/add_test_docs
Added documentation about running tests.
2017-11-01 11:25:29 +01:00
James Parker
c5ae48869f Merge branch 'master' of github.com:jprider63/docker-hs 2017-10-30 10:42:14 -04:00
James Parker
ea9acfd8ce Fix for requestUnit error handling. #41 2017-10-30 10:40:22 -04:00
jprider63
eb2baa56b6 Test case for stopping non existent container 2017-10-30 10:02:48 -04:00
Sven Koschnicke
8d09097579 added reference to docs and examples in readme 2017-10-29 18:45:49 +01:00
Sven Koschnicke
e26c195696 Added documentation about running tests. 2017-10-23 12:31:05 +02:00
Deni Bertovic
0dcc6e960b Merge pull request #38 from SKoschnicke/improve_contribution_docs
added contribution guidelines to CONTRIBUTING.md
2017-10-18 15:05:31 +02:00
Sven Koschnicke
5728e04a57 added contribution guidelines to CONTRIBUTING.md 2017-10-18 09:31:16 +02:00
Deni Bertovic
14dbd39680 Adds changelog entry 2017-10-16 15:31:03 +02:00
Deni Bertovic
c365fa0bb7 Bump version 2017-10-16 15:28:23 +02:00
Deni Bertovic
30d6f71753 Adds RUN_INTEGRATION_TESTS flag
This is useful for not running integration tests on environments
that can't support it. Like, for instance, stackage.
2017-10-16 14:56:15 +02:00
Deni Bertovic
2f949cd868 Makes licence year the year of release
According to this it makes sense to just put in the year the software
was initially released. And not have to update the year in the licence
every time.

http://www.contentious.com/2007/01/07/copyright-notice-is-the-year-really-necessary/
2017-10-10 16:37:23 +02:00
Deni Bertovic
be2255f579 Removes notice of unstable api 2017-10-04 10:21:55 +02:00
Deni Bertovic
dea08cc1f3 Bumps version to 0.4.1.0 2017-10-04 01:25:45 +02:00
Deni Bertovic
0b60d800c8 Updates Makefile 2017-10-04 01:19:39 +02:00
Deni Bertovic
7df09347e2 Adds new changelog entry 2017-10-04 01:18:05 +02:00
Deni Bertovic
e3919d3fb2 Relaxes upper bound for aeason, tls and time 2017-10-04 01:15:52 +02:00
Deni Bertovic
d1ec27aaee Merge pull request #35 from jprider63/master
#34 w/ backwards compatibility
2017-09-22 18:09:09 +02:00
locallycompact
630d490ec3 Update dependencies to work with the stack lts-9 resolver 2017-09-20 00:19:56 -04:00
Deni Bertovic
6e19bc85c4 Adds changelog for 0.4.0.1 2017-06-29 08:29:36 +02:00
Deni Bertovic
26a6315e50 Small readme change 2017-06-29 08:27:11 +02:00
Deni Bertovic
accb33698d Adds forgotten changelog 2017-06-29 08:26:12 +02:00
Deni Bertovic
98f3c027e5 Merge pull request #32 from jprider63/master
Makes `oomKillDisable` in `ContainerResources` optional.
2017-06-29 08:12:43 +02:00
James Parker
fa421b961e Makes oomKillDisable in ContainerResources optional. 2017-06-09 16:10:57 -04:00
Deni Bertovic
ab9b122833 Merge pull request #30 from denibertovic/deprecated
Adds  #25
2017-03-24 15:13:01 +01:00
Deni Bertovic
bd96554afc Use parseRequest instead of parseUrlThrow 2017-03-24 12:38:40 +01:00
Deni Bertovic
d8358ccf91 Removes duplicate extra-deps 2017-03-24 12:36:36 +01:00
Deni Bertovic
8f3fe57461 Bumps stack 7.10 lts 2017-03-23 19:31:09 +01:00
Deni Bertovic
ef010125c6 Merge branch 'deprecated' of https://github.com/kseo/docker-hs into deprecated 2017-03-23 17:45:34 +01:00
Deni Bertovic
734b9bd9ce Merge pull request #29 from denibertovic/entrypoint
Adds Entrypoint data type
2017-03-23 12:43:59 +01:00
Deni Bertovic
f5f50fab09 Gets rid of NoEntrypoint constructor
since it's the same as Entrypoint []
2017-03-23 12:03:55 +01:00
Deni Bertovic
8b973346b7 Add Entrypoint data type
It should parse "\cmd\"", "[\"cmd\"]", "[]" and "null" correctly.
(and serialize to the respective json)

Added tests for it as well as some autoformatting in tests.hs.
2017-03-21 10:13:47 +01:00
Deni Bertovic
2cfedd088b Merge branch 'entrypoint' of https://github.com/kseo/docker-hs into entrypoint 2017-03-21 00:07:03 +01:00