Commit graph

769 commits

Author SHA1 Message Date
James Nugent
ed3a43a2fe 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
894ae56e51 Merge branch 'docker_network' of https://github.com/ColinHebert/terraform into ColinHebert-docker_network 2016-01-14 07:01:03 +00:00
James Nugent
f770ba6120 Merge branch 'docker_network' of https://github.com/ColinHebert/terraform into ColinHebert-docker_network 2016-01-14 07:01:03 +00:00
Colin Hebert
bca87ec0ff Add Elem and Set to the network set 2016-01-05 03:46:24 +01:00
Colin Hebert
c823565d5d Fix typo 2016-01-04 21:03:53 +01:00
Colin Hebert
61372c7766 Add the networks entry 2016-01-04 20:58:54 +01:00
Colin Hebert
99f83853f7 Add the networks entry 2016-01-04 20:58:54 +01:00
Colin Hebert
6124159131 Add support of custom networks in docker 2016-01-02 12:20:55 +01:00
Colin Hebert
94b54c2a30 Add support of custom networks in docker 2016-01-02 12:20:55 +01:00
Colin Hebert
1d60a86a14 Convert v to string 2016-01-01 10:12:43 +01:00
Colin Hebert
34dced4b16 Add network_mode support to docker 2016-01-01 09:57:21 +01:00
Colin Hebert
a44b873992 Add network_mode support to docker 2016-01-01 09:57:21 +01:00
stack72
3f3e9fab7d Fixing yet more gofmt errors with imports 2015-12-21 09:54:24 +00:00
Paul Bellamy
1c8e4c81e4 provider/docker: Inline ports and volumes schemas for consistency 2015-12-03 10:51:59 +00:00
Paul Bellamy
ad05f3a3b5 provider/docker: Add hosts parameter for containers 2015-12-03 10:32:41 +00:00
Paul Bellamy
7bfa5f90b9 provider/docker: Add hosts parameter for containers 2015-12-03 10:32:41 +00:00
James Nugent
aa872d07c6 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
5e1c8c88f5 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
f9601a6754 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
c0c51b84ef provider/docker: fix image test
there's a new latest in town
2015-11-20 09:58:03 -06:00
ryane
5a5f5ff988 docker: improve validation of runtime constraints 2015-11-09 19:36:23 -05:00
ryane
06f89614d2 support for log driver + config in docker container 2015-11-04 15:52:16 -05:00
ryane
f1da40e648 include hostconfig when creating docker_container 2015-11-04 15:52:16 -05:00
ryane
f6e4608a35 fix resource constraint specs 2015-11-04 15:52:16 -05:00
ryane
38b1e1ce26 support for log driver + config in docker container 2015-11-04 15:52:16 -05:00
ryane
39cd0cd73b add label support to docker container resource 2015-11-04 15:52:15 -05:00
ryane
8f9b151811 add label support to docker container resource 2015-11-04 15:52:15 -05:00
ryane
7c8e029252 add basic runtime constraints to docker_container 2015-11-04 15:52:15 -05:00
ryane
38eec5fbc7 add basic runtime constraints to docker_container 2015-11-04 15:52:15 -05:00
ryane
ecbfb4ef98 restart policy support for docker_container 2015-11-04 15:52:15 -05:00
ryane
311b164d56 restart policy support for docker_container 2015-11-04 15:52:15 -05:00
ryane
a398fce15b entrypoint support for docker_container resource 2015-11-04 15:52:15 -05:00
ryane
4b257e6b2b entrypoint support for docker_container resource 2015-11-04 15:52:15 -05:00
Martin Atkins
76837d511f Merge pull request #3383 from apparentlymart/docker-container-command-docs
Example for the command arg on docker_container.
2015-10-10 17:30:33 -07:00
Panagiotis Moustafellos
ce511d53db removed extra parentheses 2015-10-08 15:48:04 +03:00
stack72
f229be7a60 Gofmt change for resource docker_image test 2015-10-08 09:47:50 +01:00
Robert Roland
d9f753ed5a Update container.html.markdown
Correcting a misspelling in the docs.
2015-10-07 13:07:41 -07:00
Martin Atkins
2c4f60f8c2 Example for the command arg on docker_container.
For those accustomed to running commands via a shell it may not be clear
why this argument is a list and what the elements of that list should be.
Hopefully giving an example will help people understand what is expected.

This is in response to the misunderstanding discovered in #3011.
2015-10-03 18:03:04 -07:00
Matti Savolainen
4bb21500a9 Fix Repository attribute in docker client PullOptions for private registries. 2015-07-03 12:58:05 +03:00
Paul Hinze
d66d85b5e2 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
Jesse Szwedko
c78e5663c3 The docker-image resource expects name, not image
to be set

[ci skip]
2015-06-28 19:16:56 -07:00
Jeff Mitchell
8b4e37a42c 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
fc6ef37d95 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
40fed60ec4 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
c2dc6c8234 fmt 2015-06-23 22:31:24 -07:00
Jeff Mitchell
383d50b35d 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
75ee86e9d9 Add privileged option to docker container resource 2015-06-04 13:05:52 +02:00
Julian Schneider
b440ebc492 Add privileged option to docker container resource 2015-06-04 13:05:52 +02:00
Paul Hinze
1c80ff0ac9 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
2659e028c0 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