Jessie Frazelle
11717741fd
Merge pull request #10989 from ahmetalpbalkan/win-cli/TestCliProxyProxyTCPSock-skip
...
integ-cli: skip TestCliProxyProxyTCPSock on remote daemon
2015-02-24 15:47:46 -08:00
Michael Crosby
f57c26553b
Add ContainerCreateResponse type
...
This type is produced on the server side and is a type safe struct that
can be encoded to json. It is consumed via the client.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-02-24 15:27:49 -08:00
Michael Crosby
435d654b09
Merge pull request #10837 from ahmetalpbalkan/win-cli/readContainerFile-with-exec
...
integration-cli: readContainerFileWithExec for links tests
2015-02-24 15:24:48 -08:00
Evan Hazlett
bf61a142b2
Merge pull request #599 from ehazlett/swarm-auto-labels
...
add swarm label of provider by default
2015-02-24 17:28:02 -05:00
Tibor Vass
e7dc7a6342
Merge pull request #9123 from rhatdan/commit-change
...
Patch to commit-change patch to add docker import support
2015-02-24 17:09:10 -05:00
Sean Li
7b0a132917
Merge pull request #200 from kitematic/sidebar-bottom-buttons
...
Added quick access to features at the bottom of sidebar.
2015-02-24 13:57:22 -08:00
Sean Li
7194ce1939
Added sidebar bottom section.
2015-02-24 13:53:00 -08:00
Michael Crosby
bd95269fb9
Merge pull request #10935 from coolljt0725/fix_commit
...
Fix docker commit make a paused container to unpaused
2015-02-24 13:28:32 -08:00
Michael Crosby
a7cacbeb1d
Merge pull request #10957 from tianon/cleanup-autogen
...
Cleanup "autogen/" if we have successful build
2015-02-24 13:25:46 -08:00
Michael Crosby
478a9462e8
Merge pull request #10980 from miminar/fix-volumes-from
...
Fixed bad handling of "container not found" error
2015-02-24 13:23:34 -08:00
Michael Crosby
7d62ebf278
Merge pull request #10985 from jfrazelle/add-tools-doc
...
add tools doc
2015-02-24 13:13:45 -08:00
Michael Crosby
aa2b3c668b
Merge pull request #10984 from thaJeztah/do-re-mi
...
Order maintainers alphabetically
2015-02-24 13:13:08 -08:00
Jessie Frazelle
3b484c9554
Merge pull request #10988 from ahmetalpbalkan/TestBuildAddBadLinks-leftover-rm
...
Remove leftover debugging artifact in test
2015-02-24 12:47:55 -08:00
Sean Li
98c08ea885
Can now have space in regex
2015-02-24 12:27:02 -08:00
Sean Li
f401c97001
Fixed cannot backspace when form is focused.
2015-02-24 12:23:49 -08:00
Sean Li
13b829ba5f
Images and regex fix for slug name.
2015-02-24 12:20:11 -08:00
Sean Li
e40fc46c77
Merge branch 'master' into sidebar-bottom-buttons
2015-02-24 12:05:03 -08:00
Ahmet Alp Balkan
6a9edfdc3b
integ-cli: skip TestCliProxyProxyTCPSock on remote daemon
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-24 12:04:33 -08:00
Evan Hazlett
4f5de31d3f
Merge pull request #590 from ehazlett/no-debug-for-docker-install
...
do not show debug for docker install by default
2015-02-24 15:01:20 -05:00
Andrea Luzzardi
f326bc1f21
Merge pull request #416 from vieux/_manager_background
...
start the manager in bg
2015-02-24 12:01:05 -08:00
Evan Hazlett
2e527e0448
Merge pull request #601 from ehazlett/logging-updates-rackspace
...
Logging updates rackspace
2015-02-24 15:00:24 -05:00
Evan Hazlett
808b4cff6d
Merge pull request #597 from ehazlett/no-error-vbox-start
...
virtualbox: check state before attempting start
2015-02-24 14:55:02 -05:00
Evan Hazlett
348be4d325
formatting from feedback from sthulb
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-24 14:52:19 -05:00
Victor Vieux
a114c363b3
start the manager in bg
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-02-24 11:49:53 -08:00
Ahmet Alp Balkan
e9e993922d
Remove leftover debugging artifact in test
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-24 11:44:14 -08:00
Evan Hazlett
e5c51d9e41
log debug message when waiting for ip
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-24 14:38:01 -05:00
Evan Hazlett
06c1c5cbeb
use swarm labels as default
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-24 14:37:00 -05:00
Sean Li
a691b7c72c
Tweaked animation time.
2015-02-24 11:14:22 -08:00
Nathan LeClaire
b01ce736d2
Finish implementing multi-machine task execution
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-02-24 11:08:49 -08:00
Jessica Frazelle
e63a693c6d
add tools doc
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com > (github: jfrazelle)
2015-02-24 11:05:05 -08:00
Michael Crosby
7fed7d7eb4
Move stats api types into api/types package
...
Move the stats structs from the api/stats package into a new package
api/types that will contain all the api structs for docker's api request
and responses.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-02-24 10:47:47 -08:00
Evan Hazlett
9ca79892a6
wip: commands across nodes
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-24 10:21:56 -08:00
Michael Crosby
d0bc3537d7
Merge pull request #10982 from msabramo/CONTRIBUTING_tweaks
...
CONTRIBUTING.md: punctuation fixes
2015-02-24 10:02:58 -08:00
Sean Li
1efad51881
Added smooth fade-in animation.
2015-02-24 10:02:10 -08:00
Dan Walsh
4a9fa9650b
I am only seeing the values I set
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-02-24 13:01:36 -05:00
Dan Walsh
17abfc3ddc
pass --change changes to the import job
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-02-24 13:01:36 -05:00
Dan Walsh
5767548fa7
add docs for commit --change
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-02-24 13:01:36 -05:00
Michael Crosby
3210d13fc8
Return error on invalid --change command
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Docker-DCO-1.1-Signed-off-by: Michael Crosby <crosbymichael@gmail.com > (github: rhatdan)
2015-02-24 13:01:35 -05:00
Daniel, Dao Quang Minh
6d4cd446fe
instantiate the builder job in commit integration tests
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: rhatdan)
2015-02-24 13:01:35 -05:00
Daniel, Dao Quang Minh
b30257ccf9
support changes in commit job
...
In addition to config env, `commit` now will also accepts a `changes` env which
is a string contains new-line separated Dockerfile instructions.
`commit` will evaluate `changes` into `runconfig.Config` and merge it with
`config` env, and then finally commit a new image with the changed config
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: rhatdan)
2015-02-24 13:01:35 -05:00
Dan Walsh
7f091eca70
build_config job: parse dockerfile ast into config
...
Instead of building the actual image, `build_config` will serialize a subset of
dockerfile ast into *runconfig.Config
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-02-24 13:01:35 -05:00
Daniel, Dao Quang Minh
f8e77dfb3d
pass --change changes to the commit job
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: rhatdan)
2015-02-24 13:01:35 -05:00
Sean Li
3b13a068ad
Changed default window option show to true.
2015-02-24 09:36:42 -08:00
Abin Shahab
3bd3f7854a
Restored removed docker init options
...
Signed-off-by: Abin Shahab <ashahab@altiscale.com > (github: ashahab-altiscale)
2015-02-24 16:59:04 +00:00
Sebastiaan van Stijn
681182ea7a
Re-order maintainers
...
Because they should be ordered alphabetically.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-02-24 17:49:03 +01:00
Marc Abramowitz
301b3ffbbb
CONTRIBUTING.md: punctuation fixes
...
Signed-off-by: Marc Abramowitz <marc@marc-abramowitz.com >
2015-02-24 08:21:49 -08:00
Evan Hazlett
93dd4f11f6
allow retries for getIp when issuing cert
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-24 11:15:59 -05:00
Evan Hazlett
bebb2dc718
show detailed messages only in debug for rackspace remove
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-24 11:02:49 -05:00
Evan Hazlett
c406e1575b
common logging for rackspace
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-24 10:52:40 -05:00
Evan Hazlett
cec8973975
add swarm label of provider by default
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-02-24 10:20:47 -05:00