ac0be9871d
Merge pull request #6569 from bcexelbi/rhel-install-update
...
Updated Red Hat Enterprise Linux installation instructions for version 7
Upstream-commit: 8f75de2d4e11c12a7d17726f005f03e742f12057
Component: engine
2014-07-22 10:30:18 +10:00
a4488cce4c
Merge pull request #7078 from unclejack/fix_archive_tar_pax_headers
...
archive/tar: update to fix writing of PAX headers
Upstream-commit: 1473374a2ad8566c85a00c3fd6f65f6c7ed5a766
Component: engine
2014-07-21 17:26:41 -07:00
0f53a7cb8b
Merge pull request #7146 from dmp42/master
...
Joining registry maintainers
Upstream-commit: b7ff33f73c258d8c2a8ffba8f6abb46114328a58
Component: engine
2014-07-21 17:02:52 -07:00
f24b5ec2fa
Joining registry maintainers
...
Docker-DCO-1.1-Signed-off-by: Olivier Gambier <olivier@docker.com > (github: dmp42)
Upstream-commit: ebc05cbbea55d6a77f1ba159b7df4c4a9c6468f3
Component: engine
2014-07-22 01:50:32 +02:00
dd94d217ed
Merge pull request #6976 from vbatts/vbatts-early_daemon_pidfile
...
docker daemon: initialize the daemon pidfile early
Upstream-commit: d0e2d9ec395f1d00b685bf80ab2431b1d8dce161
Component: engine
2014-07-21 14:26:14 -07:00
0bdbb48e10
Merge pull request #7104 from mheon/sigproxy_docs
...
Update docs on --sig-proxy
Upstream-commit: 61b675d3bb6a645f7f4683253f78f0f9ddfe5a22
Component: engine
2014-07-21 13:42:41 -07:00
983cb389b8
Merge pull request #6996 from soulshake/patch-1
...
Update https.md
Upstream-commit: d8a76a02dc43cda250d185220cdcaf8be35f3778
Component: engine
2014-07-21 12:22:59 -07:00
5d850a0bb6
Resolve merge conflict, attempt 3
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
Upstream-commit: 319a8a241e0b9182ea309b886e2d23e2f4d73c6c
Component: engine
2014-07-21 12:18:59 -07:00
903a38086f
Merge pull request #7050 from Aigeruth/fix/push_image_layer_registry_content_type
...
Add Content-Type header in PushImageLayerRegistry
Upstream-commit: b752e7402aa635b858c8559ae17080f66816bf92
Component: engine
2014-07-21 15:07:01 -04:00
fabec654d7
Merge pull request #7061 from muchweb/rms
...
Can't believe you forgot RMS
Upstream-commit: 86f20e561f1030e5177f3919394b7b8b7f88a410
Component: engine
2014-07-21 12:02:45 -07:00
e2a35d06ac
Merge pull request #7090 from philips/add-philips-to-systemd-maintainers
...
contrib/init/systemd: add philips as MAINTAINER
Upstream-commit: 6dd8eb9520ce63fce34bbd91e7ff625e25aaaef8
Component: engine
2014-07-21 11:41:38 -07:00
9470205eab
Merge pull request #7122 from LK4D4/move_some_run_tests_to_cli
...
Move some run tests to cli
Upstream-commit: e4c79736bfa24379998e6a5262b3e92adf49cbcb
Component: engine
2014-07-21 11:25:36 -07:00
15a157c395
Merge pull request #7124 from tianon/travis-compile
...
Adjust Travis to also compile, to test that compilation still succeeds
Upstream-commit: ed92c3f964698c15f613eb04a4d5cdb535563a42
Component: engine
2014-07-21 11:38:15 -06:00
9b0126179c
Merge pull request #7116 from timthelion/relativevolumeerror
...
Give context for the error that occures when you try to bind mount a vol...
Upstream-commit: 12ee68aabeb534058051250e62bc392fb7e870f5
Component: engine
2014-07-21 10:22:35 -07:00
8cc4f159b4
Merge pull request #7131 from msabramo/patch-1
...
Fix minor grammar issues in dockervolumes.md
Upstream-commit: 8365abb200028a844ba91303f110832b06d8bab3
Component: engine
2014-07-21 16:09:41 +10:00
e6ce9e7e5d
Fix minor grammar issues in dockervolumes.md
...
Upstream-commit: 4ac6375790fe0c7bc9c1bb9c3fdc67db233ff8cb
Component: engine
2014-07-20 17:05:37 -07:00
85c7a7ed04
Merge pull request #7117 from hipertracker/patch-1
...
Update dockerlinks.md
Upstream-commit: e60543400da0c5de3f6167288f7181eea8a9049d
Component: engine
2014-07-21 09:43:23 +10:00
992eebc368
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)
Upstream-commit: 3cff015169f5ca215a42f81650edc9f31095dd6f
Component: engine
2014-07-19 12:12:27 -06:00
acd409e563
Merge pull request #7114 from bfirsh/remove-blank-use-doc
...
Remove blank "use" documentation
Upstream-commit: f39e0567b6af773db20ac43f1be418de494679f7
Component: engine
2014-07-19 03:09:47 -07:00
d628315a52
Move TestCopyVolumeContent to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: e88487b321fba4d1a6d9dcd080ec5b9ae024865e
Component: engine
2014-07-19 12:42:27 +04:00
c0a07344c1
Move TestCopyVolumeUidGid to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 9a7c5be7d1d71d339b857ec20ca03cc09d4bbfa2
Component: engine
2014-07-19 12:42:27 +04:00
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
48f4247a56
Update dockerlinks.md
...
Added missing command for logging into web container.
Upstream-commit: a781de0c10d33f9af92ba8270193f218a3dafdf5
Component: engine
2014-07-19 05:38:11 +01:00
a502f604a3
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)
Upstream-commit: 7aed2130f95c22e1eb6249ffb84c1cee070cb284
Component: engine
2014-07-19 04:12:16 +00:00
bbe750e110
Remove blank "use" documentation
...
Introduced in dotcloud/docker#3070
Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk > (github: bfirsh)
Upstream-commit: b82778b293e35a147d66001e6406843dc937a233
Component: engine
2014-07-18 18:45:20 -07: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
94829c3d52
Merge pull request #7079 from LK4D4/state_tests
...
Tests on container state changing
Upstream-commit: 615f211084d21a2c7ef930b59813651943afcc41
Component: engine
2014-07-18 11:21:23 -07: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
638498458f
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)
Upstream-commit: 31351d08a35b2c903a2b6407bea09ccf1449e79c
Component: engine
2014-07-18 12:32:04 -04: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
6b13e80c3e
Updated Red Hat Enterprise Linux installation instructions for version 7
...
Docker-DCO-1.1-Signed-off-by: Brian Exelbierd <bex@pobox.com > (github: bcexelbi)
Upstream-commit: 204e080932db1cab17de2e19c826663b8b1449a6
Component: engine
2014-07-18 08:08:27 +02: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
