Commit Graph

42 Commits

Author SHA1 Message Date
Michael Kuzmin c1a9a0c766 provider/docker: authentication via values instead of files (#10151)
* Docker authentication via values

* Rename parameters to ca_material, cert_material, and key_material. Add environment variables.
2016-11-22 14:18:09 +02:00
Daniel Portella 11b3b7cf29 provider/docker: Fixes for docker_container host object and documentation (#9367)
* Updated docker container documentation

Feedback from ticket #9350 indicated that documentation was out of date

renamed `hosts_entry` to `host`
added correct type information to *Extra Hosts* section.

Refs: 9350

* Fixes for docker_container host object

Feedback from ticket #9350 updated codebase so it reflects the requirements from docker in regards to `host` which is `Required` and not optional.
It now accurately reflects the docker requirements and the terraform documentation.

Test results

> Bear in mind the failure it is because my laptop doesnt support memory swap. So this test will always fail.

Changing the Schema from `optional` to `required` made no difference to the tests.

make testacc TEST=./builtin/providers/docker/
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2016/10/14 15:04:40 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/docker/ -v  -timeout 120m
=== RUN   TestAccDockerRegistryImage_basic
--- PASS: TestAccDockerRegistryImage_basic (4.57s)
=== RUN   TestAccDockerRegistryImage_private
--- PASS: TestAccDockerRegistryImage_private (6.22s)
=== RUN   TestProvider
--- PASS: TestProvider (0.00s)
=== RUN   TestProvider_impl
--- PASS: TestProvider_impl (0.00s)
=== RUN   TestAccDockerContainer_basic
--- PASS: TestAccDockerContainer_basic (7.16s)
=== RUN   TestAccDockerContainer_volume
--- PASS: TestAccDockerContainer_volume (7.37s)
=== RUN   TestAccDockerContainer_customized
--- FAIL: TestAccDockerContainer_customized (18.99s)
	testing.go:265: Step 0 error: Check failed: Check 2/2 error: Container has wrong memory swap setting: -1
	Please check that you machine supports memory swap (you can do that by running 'docker info' command).
=== RUN   TestAccDockerImage_basic
--- PASS: TestAccDockerImage_basic (2.58s)
=== RUN   TestAccDockerImage_private
--- PASS: TestAccDockerImage_private (2.70s)
=== RUN   TestAccDockerImage_destroy
--- PASS: TestAccDockerImage_destroy (30.00s)
=== RUN   TestAccDockerImage_data
--- PASS: TestAccDockerImage_data (5.93s)
=== RUN   TestAccDockerNetwork_basic
--- PASS: TestAccDockerNetwork_basic (0.24s)
=== RUN   TestAccDockerVolume_basic
--- PASS: TestAccDockerVolume_basic (0.05s)
FAIL
exit status 1
FAIL	github.com/hashicorp/terraform/builtin/providers/docker	85.816s
Makefile:47: recipe for target 'testacc' failed
make: *** [testacc] Error 1

Refs: 9350
2016-10-27 10:54:05 +01:00
James Nugent c942707476 provider/docker: Add alternative to cert_path
Add a note about using `eval $(docker-machine env)` when using Docker
Machine to avoid having to hard code a certificate path.
2016-09-21 09:32:24 +01:00
baboune 1b6c1cccf3 Update index.html.markdown
Add note to reinforce the need for cert_path on any docker-machine based Docker environment.
2016-09-21 09:32:24 +01:00
baboune 22b8b5c532 Update index.html.markdown
Use default docker server remote API port 2376 instead of 1234.
2016-09-17 17:57:37 +02:00
Radek Simko 43de2afde1
docs: Fix misspelled words 2016-09-12 07:08:00 +01:00
kyhavlov 0b165164c4 docs: Fix exported attribute name in docker_registry_image 2016-08-19 20:35:00 -04:00
kyhavlov dd33357fbb docs: Fix example for docker_registry_image (#8308) 2016-08-19 07:40:50 +01:00
Paul Hinze d50aeeef0d
website: Docs sweep for lists & maps 2016-07-28 15:49:53 -05:00
Radek Simko deba1b63e9 docker/docs: Document new data source + limitations (#7814) 2016-07-26 17:07:35 +01:00
JB Arsenault fc838be69e Add `destroy_grace_seconds` option to stop container before delete (#7513) 2016-07-11 16:03:02 +01:00
Daniel Portella 21618a9111 provider/docker: Docker documentation and additional test message (#7412)
* added additional error info for when memory swap assert fails.

related to https://github.com/hashicorp/terraform/pull/7392

* updated docker_container documentation

reflect recent changes to docker provider around tests, dns options and
dns search support.

* Grammar and punctuation changes

Docker container documentation.

* Spell checking, grammar and punctuation.

Docker container documentation.

* Markdown change sto docker container documentation
2016-06-29 15:48:15 +01:00
Xavier Sellier e4a1d21a4b Provider Docker: (#6376)
- Add option keep_locally
- Add unit test
- Add documentation
2016-04-27 17:18:02 +01:00
VERDOÏA Laurent a24207b9b7 provider/docker: #5298 Add support for docker run --user option 2016-04-04 21:43:59 -05:00
Verdoïa Laurent ea5f53782a provider/docker: #2417 Add support for restart policy unless-stopped 2016-02-26 12:38:31 +09:00
Colin Hebert 5ef7e42834 provider/docker: Update documentation
- Use a consistent format
- Remove typos
- Specify the expected parameter type for each entry
- Change importance of block documentation
2016-01-31 08:23:35 +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 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 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 32ce8fbcb4 Add network_mode support to docker 2016-01-01 09:57:21 +01:00
Paul Bellamy 7a24764c15 provider/docker: Add hosts parameter for containers 2015-12-03 10:32:41 +00: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
Martin Atkins a97036f3a3 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
Robert Roland 2b75e65129 Update container.html.markdown
Correcting a misspelling in the docs.
2015-10-07 13:07:41 -07:00
Martin Atkins e849ec3af5 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
Jesse Szwedko b05ca5a39c The docker-image resource expects name, not image
to be set

[ci skip]
2015-06-28 19:16:56 -07:00
Julian Schneider b9a437658e Add privileged option to docker container resource 2015-06-04 13:05:52 +02:00
Paul Hinze aada41aa55 docs: provider/docker - network settings attrs 2015-04-20 12:45:58 -05:00
Mitchell Hashimoto 2acc9b2e44 Merge pull request #1564 from nickryand/docker_links
Added Docker links support to the docker_container resource.
2015-04-18 16:41:17 -07:00
Nick Downs f74405d5e7 Added Docker links support to the docker_container resource. 2015-04-16 12:42:21 -07:00
Luis Faustino f3bc644bc2 Fix #1402
Fixed the argument reference from 'name' to 'image'.
2015-04-12 22:23:15 +01:00
Hart Hoover 3fcaab9114 Fix(docs) Correct spelling error in Docker documentation 2015-04-02 10:43:40 -05:00
Mitchell Hashimoto 596511078a website: note on docker 2015-03-31 14:48:57 -07:00
Mitchell Hashimoto 2f0235b23d website: docker docs 2015-03-28 19:05:17 -07:00