Commit Graph

20395 Commits

Author SHA1 Message Date
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
43007a03a7 get layer: remove HEAD req & pass down response
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: c47ebe7a351bc639028cd48aed9d2fa2310a2a65
Component: engine
2014-07-21 20:21:18 +03:00
c7d6337458 resumablerequestreader: allow initial response
Make it possible to inspect an initial response and pass it to
ResumableRequestReader. This makes it possible to inspect an initial
response and passing it to ResumableRequestReader to avoid making an
extra request.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: f033ce3ee9ee055612acacde537687e41865e14f
Component: engine
2014-07-21 19:54:25 +03:00
cec25b5ea2 Fix a typo in the tutorial
Upstream-commit: 9ff7bbe0ac4172ea15242218e9ac4668eddc1e7f
Component: engine
2014-07-21 10:34:54 +02:00
b3754356a2 dynamically load a /versions.html_fragment file so that all old versions get the complete dropdown list of versions to select
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5cd0f0824d04a73fb798207231b47157a51604d5
Component: engine
2014-07-21 15:51:14 +10:00
9bc7000fc7 The UX spec
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c550ad59006c6a0c99b88581bb4378accea63043
Component: engine
2014-07-21 12:39:48 +10:00
afa8623ab8 initial work to make a mockup
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 8a4b79ca5016ae8de0f530ae394064dc5142e5a6
Component: engine
2014-07-21 12:39:48 +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
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
5dc6b4a870 Improve data volume container example.
Docker-DCO-1.1-Signed-off-by: Jason Livesay <ithkuil@gmail.com> (github: runvnc)
Upstream-commit: 8273cb4b9bd22ddfdd899682f08ac8327e912a28
Component: engine
2014-07-18 10:22:15 -07: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
fb5c0827a3 Skip whole dir dockerignoring with warning
Fixes #7093
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 7d97a5f4760da388c22a5a29ed95888b89a23d57
Component: engine
2014-07-18 09:35:54 +04: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
554507d5b7 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)
Upstream-commit: 81307680142d5ddd8e80c70c5da8afc799318556
Component: engine
2014-07-17 11:57:16 -07: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