Add all options #83

jkeiser · 2016-03-14T22:24:30Z

This does several things:

Allows you to pass API POST data to /create directly via docker_options: { container_config: { ... } }
Adds every single supportable command line option as a docker option (there are a number of bugs asking for various things).
Fixes a number of bugs where we weren't passing all the user's options to docker run
Makes the flow clearer by clearly differentiating between the converge container (which exists to run chef-client) and the final container (where the user's code runs).
Uses the API exclusively rather than occasionally calling out to docker run (which is one reason we had bugs supporting all the user's options).

for greater reliability

we are going to be using SSH to open up a port.

mwrock · 2016-03-15T20:40:07Z

lib/chef/provisioning/docker_driver/docker_run_options.rb

+    value.each do |ulimit|
+      type, values = ulimit.split("=", 2)
+      soft, hard = values.split(":", 2)
+      config["HostConfig"]["Ulimits"] << { "Name": type, "Soft": soft, "Hard": hard }


think this needs => not : since keys are strings

Whoah. How in the world did this work.

(since they may be shared with the actual container)

Fix Centos

…ocker

(commit often takes longer than this!)

mwrock · 2016-03-17T21:25:06Z

👍

tyler-ball added the Developing label Mar 14, 2016

jkeiser added the Developing label Mar 14, 2016

jkeiser force-pushed the jk/more-options branch 2 times, most recently from c1e82f9 to c1e933c Compare March 15, 2016 05:09

Add all options

c1e933c

This was referenced Mar 15, 2016

Update /etc/hosts of Docker container #82

Closed

Need volume support for machine_image #75

Open

docker log-driver #72

Open

jkeiser added 4 commits March 15, 2016 09:46

Add plural form of plural options to reduce confusion

e0c9bf9

Fix issue with ExtraHosts and ip addresses when starting up

0bd06ab

Fix pull (don't include repo in pull spec), separate stop and delete

8df55f2

for greater reliability

Don't set converge container networking to host unless

3472131

we are going to be using SSH to open up a port.

mwrock reviewed Mar 15, 2016
View reviewed changes

jkeiser force-pushed the jk/more-options branch 2 times, most recently from ca395cc to 95e399b Compare March 15, 2016 21:37

Don't use exposed ports on converge container

95e399b

(since they may be shared with the actual container)

jkeiser force-pushed the jk/more-options branch 2 times, most recently from b2de67d to 914c6e3 Compare March 15, 2016 22:32

jkeiser added 5 commits March 15, 2016 15:32

Run properly on ubuntu machine

914c6e3

Make from_image work again

7bdf815

Fix tests

a1093d6

Use centos-7.1 for kitchen

9286d7a

Fix Centos

Use version of docker-api that creates images correctly with recent d…

b4bc788

…ocker

jkeiser force-pushed the jk/more-options branch 2 times, most recently from e847fbd to 1f17d55 Compare March 17, 2016 02:12

Use passed-in timeouts

d7b1e6e

jkeiser force-pushed the jk/more-options branch from 1f17d55 to 46163d4 Compare March 17, 2016 02:23

Ensure we get a recent enough Docker

259ccec

jkeiser force-pushed the jk/more-options branch from 46163d4 to 259ccec Compare March 17, 2016 06:09

Set read_timeout globally to something larger than 60 seconds

a9ceca6

(commit often takes longer than this!)

jkeiser merged commit a9ceca6 into master Mar 17, 2016

jkeiser removed the Developing label Mar 17, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add all options #83

Add all options #83

jkeiser commented Mar 14, 2016

mwrock Mar 15, 2016

jkeiser Mar 15, 2016

mwrock commented Mar 17, 2016

Add all options #83

Add all options #83

Conversation

jkeiser commented Mar 14, 2016

mwrock Mar 15, 2016

Choose a reason for hiding this comment

jkeiser Mar 15, 2016

Choose a reason for hiding this comment

mwrock commented Mar 17, 2016