45fa986bbf
Merge pull request #6913 from unclejack/map_randomization_fixes
...
integcli: fix failures caused by tiny map randomization
Upstream-commit: ac6ec9df1da4467304e4b48bcc7f77385e36a515
Component: engine
2014-07-19 00:27:37 -05:00
7a2a8be431
Merge pull request #7109 from crosbymichael/update-libcontainer-july4
...
Update libcontainer to cf45d141db69ce11dcccac178e5
Upstream-commit: ccbaf4bc6ea1af015ee49f6fec1fffb75ff5e4ae
Component: engine
2014-07-18 18:40:34 -07:00
271d796112
Merge pull request #7043 from ipbabble/404NotFound
...
Upstream-commit: 93a7c84b6f1a7424d2ebff7eb5f3c0a09da19864
Component: engine
2014-07-18 18:39:42 -07:00
1a215f0eb4
Merge pull request #3070 from alexlarsson/certificates
...
Upstream-commit: c7bc929e0151b01e723feca1213a1adb9ffc7d9b
Component: engine
2014-07-18 18:27:00 -07:00
deb37a1a23
Merge pull request #7107 from bkochendorfer/patch-1
...
Update runmetrics.md
Upstream-commit: 82675ee359f65a972252e541996bd990eb127e22
Component: engine
2014-07-19 00:13:06 +00:00
5aa47fd32b
Update libcontainer to cf45d141db69ce11dcccac178e5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 1b9b11db4f43c8b55d48e0aae5e05155997fe314
Component: engine
2014-07-18 15:31:25 -07:00
3eafec647b
Merge pull request #6933 from ztombol/feat-mkimage-arch-expect
...
Fix expect script in mkimage-arch
Upstream-commit: 7ee8fd5ecfbae8982c4c0d953ed48038c809b91e
Component: engine
2014-07-18 15:47:18 -06:00
ebae204c95
Merge pull request #7098 from fabiofalci/move_ps_tests_to_cli
...
Move `docker ps` test to integration cli
Upstream-commit: e52382292f9373e73b538d7f26e5ca8efc0884b1
Component: engine
2014-07-18 14:29:40 -07:00
8cf0e7787b
Update runmetrics.md
...
Upstream-commit: 95caf8c4856ad477dbc835c6f9af5af5668389c0
Component: engine
2014-07-18 16:16:19 -05:00
173dec350c
Merge pull request #7106 from vieux/logout
...
Add logout command
Upstream-commit: 9b3c0e65daa855b2ec2528553d40c2821cd9e970
Component: engine
2014-07-18 14:13:59 -07:00
1dfe01821b
Merge pull request #7077 from tianon/fix-ubuntu-systemd
...
Fix hack/make/ubuntu to install both docker.service and docker.socket
Upstream-commit: 9870a2bcae6126689ad9cc865919a93837dd3b60
Component: engine
2014-07-18 14:13:04 -06:00
3ba66ad0ce
Merge pull request #7069 from crosbymichael/update-libcontainer-july3
...
Update libcontainer to be85764f109c3f0f62cd2a5c8be
Upstream-commit: 1646e5d69ac4e7280050594995ef291c75a5c1f5
Component: engine
2014-07-18 22:34:22 +03:00
3d4e2246d3
update style
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 56a39ca5d3010785e3b4be849c6b13c69a23721d
Component: engine
2014-07-18 17:52:24 +00:00
ee8e73d083
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)
Upstream-commit: 4162309d116fe5cb171d7d212842fe5406c544df
Component: engine
2014-07-18 21:51:55 +04:00
be50882dfa
fix doc references
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Upstream-commit: 4b5b3b43212c0a1883c56321aedbffc605be31f9
Component: engine
2014-07-18 17:45:25 +00:00
ee146b71d5
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)
Upstream-commit: 06bc4e07529a93abede35ea8fcc2906c5963f2a3
Component: engine
2014-07-18 17:42:49 +00:00
0ebb75ea35
Merge pull request #6984 from jameskyle/6937-allow-setting-of-docker-config-directory
...
Closes 6937. Allows setting of docker config dir.
Upstream-commit: 36608696e1b062a1d319f205e6d5b0c56a85f33c
Component: engine
2014-07-18 09:51:50 -07:00
0085f61a68
Move docker ps test to integration cli
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
Upstream-commit: 261dc5e2f60d8c47c36e719db0ecebd77258847e
Component: engine
2014-07-18 09:43:40 +01:00
9be351863a
Merge pull request #7094 from fredlf/update_docker-hub
...
New screenshots and a few small edits.
Upstream-commit: c11660169a9b1a18f1917d835db3893ff163065c
Component: engine
2014-07-18 02:36:33 +00:00
b18fd72d71
Merge pull request #7083 from mheon/6983_bugfix
...
Fix Panic with -t and -a stderr
Upstream-commit: 5948b105e7dcc7428e9525ccb44d543169b47a6e
Component: engine
2014-07-17 18:41:24 -07:00
f8ef72504f
Merge pull request #7082 from bdevloed/patch-1
...
Update usingdocker.md
Upstream-commit: 7a5ddd5df85a9e8e9bdfb3a7b35c44d7e2ded1eb
Component: engine
2014-07-18 01:26:15 +00:00
0e4d2f6461
Merge pull request #7068 from fredlf/add_image-tag
...
Added info re: image[:tag] to make docs consistent.
Upstream-commit: 9f036fc6eee8e92da383e1b9dec4a7375714b20c
Component: engine
2014-07-18 00:03:57 +00:00
563aeae59f
New screenshots and a few small edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: c92e13f6789ceda5b5fa78c691173e5c0bd840c4
Component: engine
2014-07-17 16:41:50 -07:00
e55262927d
integcli: fix map randomization failures
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 68bb56a4a5a5905a7f5eb0781782e1db5cfc7a89
Component: engine
2014-07-17 23:11:45 +03:00
e695b55f9e
integcli: add JSON utils for testing
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: e5e8669c7289959a2634bd3f66f89eef1bd4ef01
Component: engine
2014-07-17 23:11:40 +03:00
0d14ff1a94
Merge pull request #7072 from SvenDowideit/remove-infrastructure-dir
...
this info is out of date and forgotten
Upstream-commit: ae37f2b88f7d53b783974c28fef9cf9a478ef36c
Component: engine
2014-07-17 14:39:14 -04:00
073fd95835
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 ...
Upstream-commit: ca015b8885fb8f7ded215d7d7e55f9f7501498c7
Component: engine
2014-07-17 11:31:54 -07:00
fb15d12a83
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)
Upstream-commit: 67e3f7482f792ced05b6fb659d0d4cb8c9899a32
Component: engine
2014-07-17 19:50:50 +02:00
e650e69f7d
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)
Upstream-commit: 1476f295aca20e1c35383c133219d54a5373183f
Component: engine
2014-07-17 13:47:33 -04:00
2104fb8fd4
Merge pull request #7055 from coheyxyz/break-loop
...
Break loop correctly
Upstream-commit: dca52c47a4aaa41fc21883ab60c9303a8e9f3dfa
Component: engine
2014-07-17 18:20:12 +03:00
5a160c1d84
Update usingdocker.md
...
Change --help example command to match output in docs
Upstream-commit: f9b3147e2c3463207392d0f7a8ce533b42632815
Component: engine
2014-07-17 14:44:18 +02:00
d2349e06da
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)
Upstream-commit: ffe885ec0e8a06c1614949bf383f6d1532f02c1d
Component: engine
2014-07-17 20:27:29 +09:00
3555c6d1c2
Merge pull request #7049 from albers/default-option
...
removed default --rm option from example build command
Upstream-commit: 4ae27be2cd1cbedea9cba0f796bc9f040dde7007
Component: engine
2014-07-17 04:52:16 -04:00
777bf1081f
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)
Upstream-commit: ff08357c9be7fce37b4be2f08d85e801d07af2f0
Component: engine
2014-07-16 23:03:32 -06:00
5d0d56f865
Merge pull request #7021 from lsm5/systemd-maintainer
...
Add systemd MAINTAINERS file and update docker.service to always use socket activation
Upstream-commit: 07f9d486964f797b46edcbe3c6991e2d0eddc3c1
Component: engine
2014-07-16 23:01:37 -06:00
17983a728d
this info is out of date and forgotten
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: ade6d780d6222681e16b04ff1439240afc880a4f
Component: engine
2014-07-17 12:04:52 +10:00
35e71a0cd0
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)
Upstream-commit: 6ae07e24104af6eb245339dae3a878fb983d112e
Component: engine
2014-07-17 11:54:35 +10:00
f48be61b0a
Fix cross compile non cgo and linux systems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 7a8ea91392e0cc97caf2a6edc3b262b33a5b446d
Component: engine
2014-07-16 16:57:49 -07:00
d18a40b4ac
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)
Upstream-commit: 0d67b420b59c953cf331f735e49e7acad742a41f
Component: engine
2014-07-16 16:57:49 -07:00
81d8d08389
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)
Upstream-commit: 1501c342d815e3a128dac393b69e23f6ec39c2d7
Component: engine
2014-07-16 16:57:19 -07:00
2dd031c537
Update libcontainer to be85764f109c3f0f62cd2a5c8be
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 9fc6058aa110d5b59c5068a289b6e3a30fc86f72
Component: engine
2014-07-16 16:57:19 -07:00
19a14797ac
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)
Upstream-commit: 41d6ab6318cc2c8905a174ed28a78dfcad06cef5
Component: engine
2014-07-16 16:39:44 -07:00
3fa9feb32d
Merge pull request #7066 from unclejack/disallow_links_with_nethost
...
don't allow links to be used with --net=host
Upstream-commit: 6cd1061a5b5accf989e6633714f3a0f1f4dc21ac
Component: engine
2014-07-16 16:21:13 -07:00
4514b541fc
Merge pull request #6797 from zhgwenming/master
...
make /.dockerinit bind mount driver specific
Upstream-commit: 6d238c6fba4cef7d50a36bced46923d54140bd2e
Component: engine
2014-07-16 16:01:43 -07:00
697ca2953b
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)
Upstream-commit: be8cea98560f4e63ff367a632539bf9f6bf929a4
Component: engine
2014-07-17 00:32:24 +03:00
e8b7012cbc
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)
Upstream-commit: 2e61e8267ea6a668d728fe72406619075330a26a
Component: engine
2014-07-16 14:58:02 -06:00
2efed02012
Merge pull request #7060 from crosbymichael/case-insensitive-caps
...
Allow case insensitive caps for add and drop
Upstream-commit: dae6af1d1c6692d983151674fb6778006ef0a87a
Component: engine
2014-07-16 12:34:59 -07:00
5a03c34f92
Allow case insensitive caps for add and drop
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 7c19499c635358719c5a9c9fb1cb66a5fcf12718
Component: engine
2014-07-16 11:47:55 -07:00
7ba096c75a
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
Upstream-commit: 905ae7bb281cb8dbcc3ca6284103e0a3544db1f7
Component: engine
2014-07-16 11:47:05 -07:00
cd609dc421
Merge pull request #6954 from LK4D4/fix_container_run_after_restart_#4766
...
Set state running before dumping to disk
Upstream-commit: 5702029a0f12cd382845e0ae1a31c61450851ee0
Component: engine
2014-07-16 11:35:14 -07:00
