d8a76a02dc
Merge pull request #6996 from soulshake/patch-1
...
Update https.md
2014-07-21 12:22:59 -07:00
319a8a241e
Resolve merge conflict, attempt 3
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
2014-07-21 12:18:59 -07:00
b752e7402a
Merge pull request #7050 from Aigeruth/fix/push_image_layer_registry_content_type
...
Add Content-Type header in PushImageLayerRegistry
2014-07-21 15:07:01 -04:00
86f20e561f
Merge pull request #7061 from muchweb/rms
...
Can't believe you forgot RMS
2014-07-21 12:02:45 -07:00
6dd8eb9520
Merge pull request #7090 from philips/add-philips-to-systemd-maintainers
...
contrib/init/systemd: add philips as MAINTAINER
2014-07-21 11:41:38 -07:00
e4c79736bf
Merge pull request #7122 from LK4D4/move_some_run_tests_to_cli
...
Move some run tests to cli
2014-07-21 11:25:36 -07:00
ed92c3f964
Merge pull request #7124 from tianon/travis-compile
...
Adjust Travis to also compile, to test that compilation still succeeds
2014-07-21 11:38:15 -06:00
12ee68aabe
Merge pull request #7116 from timthelion/relativevolumeerror
...
Give context for the error that occures when you try to bind mount a vol...
2014-07-21 10:22:35 -07:00
8365abb200
Merge pull request #7131 from msabramo/patch-1
...
Fix minor grammar issues in dockervolumes.md
2014-07-21 16:09:41 +10:00
4ac6375790
Fix minor grammar issues in dockervolumes.md
2014-07-20 17:05:37 -07:00
e60543400d
Merge pull request #7117 from hipertracker/patch-1
...
Update dockerlinks.md
2014-07-21 09:43:23 +10:00
3cff015169
Adjust Travis to also compile, to test that compilation still succeeds
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-19 12:12:27 -06:00
f39e0567b6
Merge pull request #7114 from bfirsh/remove-blank-use-doc
...
Remove blank "use" documentation
2014-07-19 03:09:47 -07:00
e88487b321
Move TestCopyVolumeContent to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-19 12:42:27 +04:00
9a7c5be7d1
Move TestCopyVolumeUidGid to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-19 12:42:27 +04:00
ac6ec9df1d
Merge pull request #6913 from unclejack/map_randomization_fixes
...
integcli: fix failures caused by tiny map randomization
2014-07-19 00:27:37 -05:00
a781de0c10
Update dockerlinks.md
...
Added missing command for logging into web container.
2014-07-19 05:38:11 +01:00
7aed2130f9
Give context for the error that occures when you try to bind mount a volume with a relative path
...
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: timthelion)
2014-07-19 04:12:16 +00:00
b82778b293
Remove blank "use" documentation
...
Introduced in dotcloud/docker#3070
Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk > (github: bfirsh)
2014-07-18 18:45:20 -07:00
ccbaf4bc6e
Merge pull request #7109 from crosbymichael/update-libcontainer-july4
...
Update libcontainer to cf45d141db69ce11dcccac178e5
2014-07-18 18:40:34 -07:00
93a7c84b6f
Merge pull request #7043 from ipbabble/404NotFound
2014-07-18 18:39:42 -07:00
c7bc929e01
Merge pull request #3070 from alexlarsson/certificates
2014-07-18 18:27:00 -07:00
82675ee359
Merge pull request #7107 from bkochendorfer/patch-1
...
Update runmetrics.md
2014-07-19 00:13:06 +00:00
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
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
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
95caf8c485
Update runmetrics.md
2014-07-18 16:16:19 -05:00
9b3c0e65da
Merge pull request #7106 from vieux/logout
...
Add logout command
2014-07-18 14:13:59 -07:00
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
1646e5d69a
Merge pull request #7069 from crosbymichael/update-libcontainer-july3
...
Update libcontainer to be85764f109c3f0f62cd2a5c8be
2014-07-18 22:34:22 +03:00
615f211084
Merge pull request #7079 from LK4D4/state_tests
...
Tests on container state changing
2014-07-18 11:21:23 -07:00
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
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
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
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
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
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
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
5948b105e7
Merge pull request #7083 from mheon/6983_bugfix
...
Fix Panic with -t and -a stderr
2014-07-17 18:41:24 -07:00
7a5ddd5df8
Merge pull request #7082 from bdevloed/patch-1
...
Update usingdocker.md
2014-07-18 01:26:15 +00:00
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
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
68bb56a4a5
integcli: fix map randomization failures
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-17 23:11:45 +03:00
e5e8669c72
integcli: add JSON utils for testing
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-17 23:11:40 +03:00
8130768014
contrib/init/systemd: add philips as MAINTAINER
...
As requested after #7021 add me as a maintainer alongside the sword
toting @lsm5.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-07-17 11:57:16 -07:00
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
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
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
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
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
Aaron Huslage