Commit Graph

56 Commits

Author SHA1 Message Date
Paul Hinze 66ec38b2d9 Merge pull request #5046 from tpounds/use-built-in-schema-string-hash
Use built-in schema.HashString instead of custom hash functions.
2016-02-12 07:58:34 -06:00
Sebastiaan van Steenis 4a10530b07 Change default DOCKER_HOST value, fixes #4923 2016-02-10 20:21:17 +01:00
Trevor Pounds 0cd0ff0f8e Use built-in schema.HashString. 2016-02-07 16:29:34 -08:00
Colin Hebert d89c365838 remove extra parenthesis 2016-01-31 08:49:35 +11:00
Colin Hebert fd3ae2d607 Catch potential custom network errors in docker 2016-01-31 08:31:30 +11:00
James Nugent 4b7a98584a provider/docker: Mount named volumes in containers
This adds support for specifying named volumes for mounting in a
`docker_container` resource.
2016-01-15 21:59:33 +00:00
Colin Hebert e887ac2523 provider/docker: Add `docker_volume` resource 2016-01-15 17:34:53 +00:00
James Nugent 3380f08e5a provider/docker: Tweak and test `host_entry`
This adds acceptance tests for specifying extra hosts on Docker
containers. It also renames the repeating block from `hosts` to `host`,
which reads more naturally in the schema when multiple instances of the
block are declared.
2016-01-15 03:02:20 +00:00
James Nugent 35c21cb808 Merge branch 'docker-extra-hosts' of https://github.com/paulbellamy/terraform into paulbellamy-docker-extra-hosts 2016-01-14 15:48:51 +00:00
James Nugent 65b071d1af provider/docker: Fix flaky integration tests
Asserting on the value of `latest` on an image is prone to failing
because of new images being pushed upstream. Instead of asserting on a
hash, we assert that the value matches a regular expression for the
format of an image hash.
2016-01-14 09:12:05 +00:00
James Nugent ee7553f076 Merge branch 'docker_network' of https://github.com/ColinHebert/terraform into ColinHebert-docker_network 2016-01-14 07:01:03 +00:00
Colin Hebert f72322ca33 Add Elem and Set to the network set 2016-01-05 03:46:24 +01:00
Colin Hebert 35188f3694 Fix typo 2016-01-04 21:03:53 +01:00
Colin Hebert 6e36095644 Add the networks entry 2016-01-04 20:58:54 +01:00
Colin Hebert f09280891c Add support of custom networks in docker 2016-01-02 12:20:55 +01:00
Colin Hebert ad0a763661 Convert v to string 2016-01-01 10:12:43 +01:00
Colin Hebert 32ce8fbcb4 Add network_mode support to docker 2016-01-01 09:57:21 +01:00
stack72 5fbec544d7 Fixing yet more gofmt errors with imports 2015-12-21 09:54:24 +00:00
Paul Bellamy 52d178b7ac provider/docker: Inline ports and volumes schemas for consistency 2015-12-03 10:51:59 +00:00
Paul Bellamy 7a24764c15 provider/docker: Add hosts parameter for containers 2015-12-03 10:32:41 +00:00
James Nugent 597fafbb68 provider/docker: locate container via ID not name
This reapplies the patch mentioned in #3364 - for an unknown reason the
diff there was incorrect.
2015-12-02 17:27:24 -05:00
James Nugent 4ce6455e8a provider/docker: Refer to a tag instead of latest
This should make tests more stable going forward. Also switch out the
image used from Ubuntu to Alpine Linux to reduce required download size
during test runs.
2015-12-02 15:08:16 -05:00
James Nugent 50d7abcd8a Merge pull request #3761 from ryane/f-provider-docker-improvements
provider/docker: support additional arguments for `docker_container` resource
2015-12-02 11:46:29 -05:00
Paul Hinze e67551a641 provider/docker: fix image test
there's a new latest in town
2015-11-20 09:58:03 -06:00
ryane 4fc60c9f89 docker: improve validation of runtime constraints 2015-11-09 19:36:23 -05:00
ryane b5ae355a99 include hostconfig when creating docker_container 2015-11-04 15:52:16 -05:00
ryane 1f739d31da fix resource constraint specs 2015-11-04 15:52:16 -05:00
ryane 72c86a62c0 support for log driver + config in docker container 2015-11-04 15:52:16 -05:00
ryane 4531866d8d add label support to docker container resource 2015-11-04 15:52:15 -05:00
ryane 6842c32d03 add basic runtime constraints to docker_container 2015-11-04 15:52:15 -05:00
ryane 17d185808e restart policy support for docker_container 2015-11-04 15:52:15 -05:00
ryane 0ded14f160 entrypoint support for docker_container resource 2015-11-04 15:52:15 -05:00
Panagiotis Moustafellos e4845f75cc removed extra parentheses 2015-10-08 15:48:04 +03:00
stack72 4cf9c64de0 Gofmt change for resource docker_image test 2015-10-08 09:47:50 +01:00
Matti Savolainen 09e336a80a Fix Repository attribute in docker client PullOptions for private registries. 2015-07-03 12:58:05 +03:00
Paul Hinze 4981d7d28c provider/docker: [tests] change images
use a base image with a long running process - fixes container tests
2015-06-29 16:09:05 -05:00
Jeff Mitchell edbc578316 As discussed on the issue, remove the hard-coded delay on startup in
favor of attempting to detect if the initial container ever enters
running state, and erroring out if not. It will re-check the container
once every 500ms for 15 seconds total; future work could make that
configurable.
2015-06-25 15:11:00 +00:00
Jeff Mitchell 56cfba2509 Fix a serious problem when using links.
Links cause there to be more than one name for a container to be
returned. As a result, only looking at the first element of the
container names could cause a container to not be found, leading
Terraform to remove it from state and attempt to recreate it.
2015-06-25 14:40:03 +00:00
Jeff Mitchell 2e01e0635b When linking to other containers, introduce a slight delay; this lets
the Docker API get those containers running. Otherwise when
you try to start a container linking to them, the start command
will fail, leading to an error.
2015-06-25 14:40:03 +00:00
Mitchell Hashimoto cddd54c3de fmt 2015-06-23 22:31:24 -07:00
Jeff Mitchell 0558763f87 This puts the image parsing code (mostly) back to how it was before. The
regex solution is extremely complex, which makes it hard to debug and
understand; the original switches and
commenting lay out the various cases in a straightforward fashion. Plus,
implementing namespace/repo support in the original code was a simple
strings.Join call.
2015-06-12 19:36:52 +00:00
Julian Schneider b9a437658e Add privileged option to docker container resource 2015-06-04 13:05:52 +02:00
Paul Hinze 44e448b8c9 provider/docker: update image sha
Should eventually see if there's a way to rework this so it's less
brittle. But for now, we band-aid!
2015-05-07 09:50:16 -05:00
Jeff Thompson 8e53355ff3 Added support for more complexly images repos such as images on a private registry that are stored as namespace/name 2015-05-05 23:22:09 +00:00
Paul Hinze d55c8d8404 provider/docker: fmt on container resource 2015-04-20 14:18:46 -05:00
Paul Hinze 3ded884d95 provider/docker: guard against nil NetworkSettings 2015-04-20 12:42:36 -05:00
Stephan Epping c2319da1aa Add docker container network settings to output attribute 2015-04-20 12:41:35 -05:00
Nick Downs f74405d5e7 Added Docker links support to the docker_container resource. 2015-04-16 12:42:21 -07:00
Mitchell Hashimoto db58c7dd33 providers/docker: default cert_path to non-nil so input isn't asked 2015-04-09 09:49:03 -07:00
Mitchell Hashimoto 118a5b9dfd providers/docker: ping docker server on startup 2015-03-28 19:06:48 -07:00