Commit Graph

9585 Commits

Author SHA1 Message Date
Victor Vieux
ccbaf4bc6e Merge pull request #7109 from crosbymichael/update-libcontainer-july4
Update libcontainer to cf45d141db69ce11dcccac178e5
2014-07-18 18:40:34 -07:00
Solomon Hykes
93a7c84b6f Merge pull request #7043 from ipbabble/404NotFound 2014-07-18 18:39:42 -07:00
Solomon Hykes
c7bc929e01 Merge pull request #3070 from alexlarsson/certificates 2014-07-18 18:27:00 -07:00
Sven Dowideit
82675ee359 Merge pull request #7107 from bkochendorfer/patch-1
Update runmetrics.md
2014-07-19 00:13:06 +00:00
Michael Crosby
1b9b11db4f Update libcontainer to cf45d141db69ce11dcccac178e5
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-18 15:31:25 -07:00
Tianon Gravi
7ee8fd5ecf Merge pull request #6933 from ztombol/feat-mkimage-arch-expect
Fix expect script in mkimage-arch
2014-07-18 15:47:18 -06:00
Victor Vieux
e52382292f Merge pull request #7098 from fabiofalci/move_ps_tests_to_cli
Move `docker ps` test to integration cli
2014-07-18 14:29:40 -07:00
Brett Kochendorfer
95caf8c485 Update runmetrics.md 2014-07-18 16:16:19 -05:00
Victor Vieux
9b3c0e65da Merge pull request #7106 from vieux/logout
Add logout command
2014-07-18 14:13:59 -07:00
Tianon Gravi
9870a2bcae Merge pull request #7077 from tianon/fix-ubuntu-systemd
Fix hack/make/ubuntu to install both docker.service and docker.socket
2014-07-18 14:13:04 -06:00
unclejack
1646e5d69a Merge pull request #7069 from crosbymichael/update-libcontainer-july3
Update libcontainer to be85764f109c3f0f62cd2a5c8be
2014-07-18 22:34:22 +03:00
Victor Vieux
615f211084 Merge pull request #7079 from LK4D4/state_tests
Tests on container state changing
2014-07-18 11:21:23 -07:00
Victor Vieux
56a39ca5d3 update style
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-18 17:52:24 +00:00
Alexandr Morozov
4162309d11 Tests on container state changing
It could catch error that was fixed in #6954
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-07-18 21:51:55 +04:00
Daniel, Dao Quang Minh
4b5b3b4321 fix doc references
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-07-18 17:45:25 +00:00
Daniel, Dao Quang Minh
06bc4e0752 Add logout command
"docker logout [SERVER]" will remove the registry server' credentials from
.dockercfg file. If a server is not specified, it will log user out of the
default docker registry server

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-07-18 17:42:49 +00:00
Fred Lifton
36608696e1 Merge pull request #6984 from jameskyle/6937-allow-setting-of-docker-config-directory
Closes 6937. Allows setting of docker config dir.
2014-07-18 09:51:50 -07:00
Fabio Falci
261dc5e2f6 Move docker ps test to integration cli
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
2014-07-18 09:43:40 +01:00
Sven Dowideit
c11660169a Merge pull request #7094 from fredlf/update_docker-hub
New screenshots and a few small edits.
2014-07-18 02:36:33 +00:00
Victor Vieux
5948b105e7 Merge pull request #7083 from mheon/6983_bugfix
Fix Panic with -t and -a stderr
2014-07-17 18:41:24 -07:00
Sven Dowideit
7a5ddd5df8 Merge pull request #7082 from bdevloed/patch-1
Update usingdocker.md
2014-07-18 01:26:15 +00:00
Sven Dowideit
9f036fc6ee Merge pull request #7068 from fredlf/add_image-tag
Added info re: image[:tag] to make docs consistent.
2014-07-18 00:03:57 +00:00
Fred Lifton
c92e13f678 New screenshots and a few small edits.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-17 16:41:50 -07:00
Tibor Vass
ae37f2b88f Merge pull request #7072 from SvenDowideit/remove-infrastructure-dir
this info is out of date and forgotten
2014-07-17 14:39:14 -04:00
Fred Lifton
ca015b8885 Merge pull request #7027 from SvenDowideit/use-a-hello-world-micro-image
Tianon made a micro-image (sub one meg?) that we can use as a very fast ...
2014-07-17 11:31:54 -07:00
Tianon Gravi
ee7313472c Merge pull request #7088 from vincentbernat/fix/zsh-completion-update
Update zsh completion for docker command with upstream (felixr/docker-zsh-completion) latest
2014-07-17 12:05:23 -06:00
Vincent Bernat
67e3f7482f zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
2014-07-17 19:50:50 +02:00
Matthew Heon
1476f295ac Bugfix: only use io.Copy in hijack if attaching both stdout and stderr
Add regression tests to ensure issue is fixed.

Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
2014-07-17 13:47:33 -04:00
unclejack
dca52c47a4 Merge pull request #7055 from coheyxyz/break-loop
Break loop correctly
2014-07-17 18:20:12 +03:00
bdevloed
f9b3147e2c Update usingdocker.md
Change --help example command to match output in docs
2014-07-17 14:44:18 +02:00
Kohei Tsuruta
ffe885ec0e Change switch to if so that the break statements correctly breaks loop
Docker-DCO-1.1-Signed-off-by: Kohei Tsuruta <coheyxyz@gmail.com> (github: coheyxyz)
2014-07-17 20:27:29 +09:00
James Turnbull
4ae27be2cd Merge pull request #7049 from albers/default-option
removed default --rm option from example build command
2014-07-17 04:52:16 -04:00
Tianon Gravi
ff08357c9b Fix hack/make/ubuntu to install both docker.service and docker.socket
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-16 23:03:32 -06:00
Tianon Gravi
07f9d48696 Merge pull request #7021 from lsm5/systemd-maintainer
Add systemd MAINTAINERS file and update docker.service to always use socket activation
2014-07-16 23:01:37 -06:00
SvenDowideit
ade6d780d6 this info is out of date and forgotten
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-17 12:04:52 +10:00
Sven Dowideit
6ae07e2410 Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-07-17 11:54:35 +10:00
Michael Crosby
7a8ea91392 Fix cross compile non cgo and linux systems
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-16 16:57:49 -07:00
Michael Crosby
0d67b420b5 Make tty term exec driver specific
lxc is special in that we cannot create the master outside of the
container without opening the slave because we have nothing to provide to the
cmd.  We have to open both then do the crazy setup on command right now instead of
passing the console path to lxc and telling it to open up that console.  we save a couple of
openfiles in the native driver because we can do this.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-16 16:57:49 -07:00
Michael Crosby
1501c342d8 Don't create pty slave in the daemon for native driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-16 16:57:19 -07:00
Michael Crosby
9fc6058aa1 Update libcontainer to be85764f109c3f0f62cd2a5c8be
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-16 16:57:19 -07:00
Fred Lifton
41d6ab6318 Added info re: image[:tag] to make docs consistent. Fixed a markdown issue.
Closes issue #6833

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-16 16:39:44 -07:00
Victor Vieux
6cd1061a5b Merge pull request #7066 from unclejack/disallow_links_with_nethost
don't allow links to be used with --net=host
2014-07-16 16:21:13 -07:00
Victor Vieux
6d238c6fba Merge pull request #6797 from zhgwenming/master
make /.dockerinit bind mount driver specific
2014-07-16 16:01:43 -07:00
Tianon Gravi
f84bcc6bd0 Merge pull request #7064 from tianon/debootstrap-gzipindexes
Add "Acquire::GzipIndexes" to contrib/mkimage/debootstrap
2014-07-16 15:50:54 -06:00
unclejack
be8cea9856 don't allow links to be used with --net=host
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-17 00:32:24 +03:00
Tianon Gravi
2e61e8267e Add "Acquire::GzipIndexes" to contrib/mkimage/debootstrap
This results in a dramatic improvement in the size of individual "apt-get update" layers (on a clean wheezy base, from "29.88 MB" down to "8.273 MB").

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-16 14:58:02 -06:00
Victor Vieux
dae6af1d1c Merge pull request #7060 from crosbymichael/case-insensitive-caps
Allow case insensitive caps for add and drop
2014-07-16 12:34:59 -07:00
Michael Crosby
7c19499c63 Allow case insensitive caps for add and drop
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-07-16 11:47:55 -07:00
Victor Vieux
905ae7bb28 Merge pull request #7045 from SvenDowideit/pr_out_re_write_to_put_the_emphasis_on_the_format
re-write to put the emphasis on the  format
2014-07-16 11:47:05 -07:00
Michael Crosby
5702029a0f Merge pull request #6954 from LK4D4/fix_container_run_after_restart_#4766
Set state running before dumping to disk
2014-07-16 11:35:14 -07:00