Sven Dowideit
9dc82e6102
Merge pull request #7134 from MidnightDesign/patch-1
...
Fix a typo in the tutorial
2014-07-22 12:00:06 +10:00
Sven Dowideit
1cc55fda3d
Merge pull request #7112 from proppy/patch-8
...
docs/installation/google: update gcloud options
2014-07-22 11:22:08 +10:00
Sven Dowideit
324010ad66
Merge pull request #7030 from runvnc/patch-1
...
Better example for data container
2014-07-22 10:49:27 +10:00
Sven Dowideit
8f75de2d4e
Merge pull request #6569 from bcexelbi/rhel-install-update
...
Updated Red Hat Enterprise Linux installation instructions for version 7
2014-07-22 10:30:18 +10:00
Victor Vieux
1473374a2a
Merge pull request #7078 from unclejack/fix_archive_tar_pax_headers
...
archive/tar: update to fix writing of PAX headers
2014-07-21 17:26:41 -07:00
Michael Crosby
b7ff33f73c
Merge pull request #7146 from dmp42/master
...
Joining registry maintainers
2014-07-21 17:02:52 -07:00
Olivier Gambier
ebc05cbbea
Joining registry maintainers
...
Docker-DCO-1.1-Signed-off-by: Olivier Gambier <olivier@docker.com> (github: dmp42)
2014-07-22 01:50:32 +02:00
Victor Vieux
d0e2d9ec39
Merge pull request #6976 from vbatts/vbatts-early_daemon_pidfile
...
docker daemon: initialize the daemon pidfile early
2014-07-21 14:26:14 -07:00
Fred Lifton
61b675d3bb
Merge pull request #7104 from mheon/sigproxy_docs
...
Update docs on --sig-proxy
2014-07-21 13:42:41 -07:00
Aaron Huslage
d8a76a02dc
Merge pull request #6996 from soulshake/patch-1
...
Update https.md
2014-07-21 12:22:59 -07:00
soulshake
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
Vincent Batts
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
Michael Crosby
86f20e561f
Merge pull request #7061 from muchweb/rms
...
Can't believe you forgot RMS
2014-07-21 12:02:45 -07:00
Michael Crosby
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
Michael Crosby
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
Johan Euphrosine
e1bb99d925
docs/installation/google: update gcloud options
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-07-21 10:55:12 -07:00
Tianon Gravi
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
Michael Crosby
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
Rudolph Gottesheim
9ff7bbe0ac
Fix a typo in the tutorial
2014-07-21 10:34:54 +02:00
Sven Dowideit
8365abb200
Merge pull request #7131 from msabramo/patch-1
...
Fix minor grammar issues in dockervolumes.md
2014-07-21 16:09:41 +10:00
Marc Abramowitz
4ac6375790
Fix minor grammar issues in dockervolumes.md
2014-07-20 17:05:37 -07:00
Sven Dowideit
e60543400d
Merge pull request #7117 from hipertracker/patch-1
...
Update dockerlinks.md
2014-07-21 09:43:23 +10:00
Tianon Gravi
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
James Turnbull
f39e0567b6
Merge pull request #7114 from bfirsh/remove-blank-use-doc
...
Remove blank "use" documentation
2014-07-19 03:09:47 -07:00
LK4D4
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
LK4D4
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
Tibor Vass
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
Jaroslaw Zabiello
a781de0c10
Update dockerlinks.md
...
Added missing command for logging into web container.
2014-07-19 05:38:11 +01:00
Timothy
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
Ben Firshman
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
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
Jason Livesay
8273cb4b9b
Improve data volume container example.
...
Docker-DCO-1.1-Signed-off-by: Jason Livesay <ithkuil@gmail.com> (github: runvnc)
2014-07-18 10:22:15 -07: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
Matthew Heon
31351d08a3
Update docs on --sig-proxy to indicate that SIGKILL and SIGSTOP cannot be proxied
...
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
2014-07-18 12:32:04 -04: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