Michael Crosby
a52e28bc8b
Merge pull request #10077 from crosbymichael/parallel-image-check
...
Parallel image lookup
Upstream-commit: e90df7c8d2c6c56637f07c2ebf9186f6c94d5f0b
Component: engine
2015-01-13 17:02:49 -08:00
Michael Crosby
863904b2ee
Merge pull request #10080 from crosbymichael/pid-ns
...
Add --pid flag for staying in the host's pid namespace
Upstream-commit: 47e3da848ffbe88d0188ae6cfc09d6e1668bc293
Component: engine
2015-01-13 17:00:18 -08:00
Michael Crosby
b769333838
Merge pull request #10036 from HuKeping/docs-next
...
docs: update docker inspect part of docs
Upstream-commit: 8ac075b846609f73ad8aa29d6e9dbb6cd2392293
Component: engine
2015-01-13 16:43:42 -08:00
Michael Crosby
6955e4f0e5
Merge pull request #10079 from tonistiigi/fix-attach-stdin
...
Fix attach stream closing issues
Upstream-commit: 23b48fbe146b6412390e18eb9ac8173ef43e73df
Component: engine
2015-01-13 16:40:42 -08:00
Michael Crosby
24529f4dc7
Add test for --pid=host
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 15e8f3fdd31dc498be106a69a7e29ba459c36c1a
Component: engine
2015-01-13 16:39:08 -08:00
Dan Walsh and Michael Crosby
458ae31cfd
Allow the container to share the PID namespace with the host
...
We want to be able to use container without the PID namespace. We basically
want containers that can manage the host os, which I call Super Privileged
Containers. We eventually would like to get to the point where the only
namespace we use is the MNT namespace to bring the Apps userspace with it.
By eliminating the PID namespace we can get better communication between the
host and the clients and potentially tools like strace and gdb become easier
to use. We also see tools like libvirtd running within a container telling
systemd to place a VM in a particular cgroup, we need to have communications of the PID.
I don't see us needing to share PID namespaces between containers, since this
is really what docker exec does.
So currently I see us just needing docker run --pid=host
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 23feaaa240853c0e7f9817f8c2d272dd1c93ac3f
Component: engine
2015-01-13 16:35:17 -08:00
Tonis Tiigi
3fb41b40ef
Fix attach stream closing issues
...
Fixes : #9860
Fixes: detach and attach tty mode
We never actually need to close container `stdin` after `stdout/stderr` finishes. We only need to close the `stdin` goroutine. In some cases this also means closing `stdin` but that is already controlled by the goroutine itself.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 28cf8fddd4c19e98fd0a6fcf0a6e7ea545521412
Component: engine
2015-01-14 02:03:25 +02:00
Jessie Frazelle
21dc7e659d
Merge pull request #10068 from jfrazelle/api-bump-rename
...
Add reference to rename endpoint in correct version & add to new
Upstream-commit: 0eefae8e0db0c3c567e8807f09434a0da3fc1261
Component: engine
2015-01-13 15:58:36 -08:00
Michael Crosby
dc1c238ed6
Use channels and set workers to make image lookup safe
...
This refactors the starting work by the prior commits to make this safe
for access. A maximum of 5 worker go routines are started to lookup
images on the endpoint. Another go routine consumes the images that are
required to be pushed into a map for quick lookups. The map is required
because the pushing of the image json and layer have to be done in the
correct order or the registry will explode in fire.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 476cf1b906ca14cc3ce1347f1aa479713fa6ce6e
Component: engine
2015-01-13 15:52:44 -08:00
Ian Calvert and Michael Crosby
0f5c9b554c
Replace custom waiting code with a WaitGroup
...
Signed-off-by: Ian Calvert <ianjcalvert@gmail.com >
Upstream-commit: 33286589291a56fe0a4728f8b45ad3feb5494226
Component: engine
2015-01-13 15:32:47 -08:00
Ian Calvert and Michael Crosby
1f4175ede8
Run the remote image presence checks in parallel
...
Signed-off-by: Ian Calvert <ianjcalvert@gmail.com >
Upstream-commit: 90c5ff4f06b8672cd2b427d120a8988bfc9f1de7
Component: engine
2015-01-13 15:32:47 -08:00
Jessica Frazelle
dbd5499197
Add reference to rename endpoint in correct version & add to new
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ee78e3f28459b655bf7df71eb4e2e22a04a8948d
Component: engine
2015-01-13 15:22:04 -08:00
unclejack
94b5bf5737
Merge pull request #10003 from vbatts/vbatts-dm_loop_file_info
...
devmapper: show device and loop file , if used
Upstream-commit: 044d979f4ec83aac5664691d29123c34f6db68d6
Component: engine
2015-01-14 01:15:09 +02:00
Victor Vieux
3d1cd66149
Merge pull request #10070 from thaJeztah/change-back-error-message
...
Mention "or rename" again in error-message.
Upstream-commit: ff401263897a8573374989db8e51d3525fa194cf
Component: engine
2015-01-13 14:56:15 -08:00
Victor Vieux
b2532a1210
Merge pull request #10073 from tonistiigi/fix-unix-integration-cli
...
Fix filenames for unix only integration-cli tests
Upstream-commit: d8e6e32222c9deb0b4b5c77fc5bdedb18e5f457e
Component: engine
2015-01-13 14:55:31 -08:00
Victor Vieux
7c9f917c40
Merge pull request #10071 from mota/cleanup-router
...
Remove error return type from createRouter and ServeRequest
Upstream-commit: 3943b381efbe8da9a27f43e07710f3c81cb2c3be
Component: engine
2015-01-13 14:46:36 -08:00
Tonis Tiigi
cb72368bb7
Fix filenames for unix only integration-cli tests
...
Test suffix comes after the platform/arch.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f9876dade26fd779c1cb0e2156e635c85c6e8ee2
Component: engine
2015-01-14 00:31:25 +02:00
Pierre Wacrenier
a75e2deaba
Remove error return type from createRouter and ServeRequest
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com >
Upstream-commit: 02923d43e20f7be6c2e1ed48846d188a682ff919
Component: engine
2015-01-13 22:43:31 +01:00
Alexander Morozov
c7165c65cf
Merge pull request #10058 from HuKeping/work
...
restart: Fix the compare of restart policy
Upstream-commit: 5862422a49fd8585a74630cf99792a1b3851a2e7
Component: engine
2015-01-13 13:38:52 -08:00
Sebastiaan van Stijn
d76b9718d9
Mention "or rename" again in error-message.
...
The "or rename" part was removed from the error-message,
because renaming wasn't possible at the time.
Now that https://github.com/docker/docker/pull/8570 is merged,
renaming existing containers is possible.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 78820a63d647276cf17dac9ac71ed2beb19f285d
Component: engine
2015-01-13 21:57:48 +01:00
Michael Crosby
43e822f369
Merge pull request #10069 from tianon/docker-py-commit
...
Switch docker-py clone to use an explicit commit for natural cache-busting
Upstream-commit: 0db6bb3cbf508edd89b83c60c242333b5f05d501
Component: engine
2015-01-13 11:43:28 -08:00
Tianon Gravi
e622152215
Switch docker-py clone to use an explicit commit for natural cache-busting
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 3c01c971cdec8822086d03f509e119cb8a8c719c
Component: engine
2015-01-13 12:34:55 -07:00
Alexander Morozov
59accfd690
Merge pull request #9973 from duglin/Issue9880
...
Make sure that ADD/COPY still populate the cache even if they don't use it
Upstream-commit: 99a15ec8bd548563a1ac4f652c55d4bb1ff769e4
Component: engine
2015-01-13 11:17:34 -08:00
Victor Vieux
62d740bb49
Merge pull request #10064 from hqhq/hq_fix_flag_comments
...
correct the flag comments
Upstream-commit: eaeaf0d8e312dff5f4677f660a6e5356f6f82d84
Component: engine
2015-01-13 11:06:24 -08:00
Jessie Frazelle
663cdb3f16
Merge pull request #9951 from andersjanmyr/add-proxy-from-environment-to-client
...
Add ProxyFromEnvironment enables client via proxy.
Upstream-commit: ab86f591c323b38c918a026f38a26df120a475ac
Component: engine
2015-01-13 10:53:00 -08:00
Jessie Frazelle
a7f4603fba
Merge pull request #9764 from ztombol/fix-reduce-arch-rootfs-size
...
Revisiting mkimage-arch.sh
Upstream-commit: 21cf4b4c4cd6cc1f4667db4f334286bdbe39e2e2
Component: engine
2015-01-13 10:39:45 -08:00
Jessie Frazelle
080d79ba9a
Merge pull request #8570 from brahmaroutu/rename_container_3036
...
Rename a existing container
Upstream-commit: b9e42d66e790535fe1226adea4ff39e25f493b51
Component: engine
2015-01-13 10:37:29 -08:00
Alexander Morozov
c9dd2d86fb
Merge pull request #10013 from icecrime/9979_oom_exit_code
...
Fix error code when exiting on OOM
Upstream-commit: 9621e59909a93b90a4dd04b628bcbe821b2a1e51
Component: engine
2015-01-13 10:33:21 -08:00
Zoltan Tombol
d5a1764c0a
Delete man pages of installed packages in mkimage-arch.sh
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
Upstream-commit: 18c0b415644b594969bbec49de51098be62d18f8
Component: engine
2015-01-13 18:10:50 +01:00
Zoltan Tombol
88f9df3419
Revise list of installed packages in mkimage-arch.sh
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
Upstream-commit: 9f59b057be25656214d65040ae113c0d76d99324
Component: engine
2015-01-13 18:10:50 +01:00
Jessie Frazelle
4cf7955121
Merge pull request #10008 from rhatdan/help
...
Fix docker run/create not printing error messages
Upstream-commit: 6e5c5d33dd6efd65f6d6239099acb2be989423c5
Component: engine
2015-01-13 06:48:33 -08:00
Dan Walsh
287a9987a0
Fix docker run/exec/create not printing error messages
...
If an error message happens while parsing docker run or docker exec, the message
is not being printed out.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 12a7e78b125afd277adb7cd099817a419f4faaa0
Component: engine
2015-01-13 09:23:13 -05:00
Qiang Huang
dea4567bd2
correct the flag comments
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 00bd7b4c414061d71d7f94b5850cbe132da623f0
Component: engine
2015-01-13 15:40:24 +08:00
Arnaud Porterie
d6590e04a1
Test case for error code when exiting on OOM
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 9a9339d9a23e0005b769bd2f44c722c4a6be730f
Component: engine
2015-01-12 23:16:28 -08:00
HuKeping
4db0e2e1ec
restart: Fix the compare of restart policy
...
Since the failure count of container will increase by 1 every time it
exits successfully, the compare in function shouldRestart() will stop
container to restart by the last time.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: e721ed9b5319e8e7c1daf87c34690f8a4e62c9e3
Component: engine
2015-01-13 13:05:30 +08:00
Michael Crosby
37a68ceed5
Merge pull request #10055 from icecrime/upgrade_libcontainer
...
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
Upstream-commit: 9f2c48614497dee2448b65c81aa6d44953484372
Component: engine
2015-01-12 20:44:25 -08:00
Tianon Gravi
9375c2930b
Merge pull request #10057 from tianon/fix-tgz
...
Fix tgz for Windows binaries
Upstream-commit: 5d59fdcd381673af021cf00265bd1fb4014083e4
Component: engine
2015-01-12 20:28:04 -07:00
Srini Brahmaroutu and Srini Brahmaroutu
eacdfc7d44
rename a existing container
...
Closes #3036
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 21a809d9ae0ef8392f37c9262dca93ff31966e22
Component: engine
2015-01-13 03:27:17 +00:00
Tianon Gravi
9e47357d55
Fix tgz for Windows binaries
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 71b03d8aeb76b50ca05116c04ad724f380ef08f3
Component: engine
2015-01-12 19:56:53 -07:00
Arnaud Porterie
f0e21e0f5c
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
...
Correct exit code when dying on a signal (fixes #9979 ).
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 009041cdfd815c0ab49493f9f5757b171ee8c987
Component: engine
2015-01-12 18:12:59 -08:00
Jessie Frazelle
6a864dec5f
Merge pull request #10029 from soulshake/add-cecilia-payne-gaposchkin
...
Add Cecilia Payne-Gaposchkin to names generator.
Upstream-commit: 9b0072a7e63f560614fb9ba1b454b444cf4fe13e
Component: engine
2015-01-12 17:31:19 -08:00
AJ Bowen
aa2236d495
Add Cecilia Payne-Gaposchkin to the names generator.
...
Signed-off-by: AJ Bowen <aj@gandi.net >
Upstream-commit: 41178adb7e4e3df27c99c462b069dc9c196af2c3
Component: engine
2015-01-12 16:24:15 -08:00
Jessie Frazelle
c05f481a32
Merge pull request #10054 from shin-/docker-py-bump-0.7.1
...
Bumped docker-py version to latest release
Upstream-commit: 0da9540eda55caaa8ed486b6814afc253a0e181d
Component: engine
2015-01-12 15:27:44 -08:00
Alexander Morozov
f49ac13c12
Merge pull request #10053 from vieux/update_copyrights
...
update copyrights to 2015
Upstream-commit: 6ef475badae07c973cd53f5b84b0b2cdc2a1e743
Component: engine
2015-01-12 15:07:59 -08:00
Joffrey F
1ea6d14644
Bumped docker-py version to latest release
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: 3873b19c31a882a3240fc04b63e23e8a557028c0
Component: engine
2015-01-12 15:01:09 -08:00
Victor Vieux
502d87f39d
fix issue with goimport
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: b70632ec532d4a948e227a646f8286d7c439cb4f
Component: engine
2015-01-12 22:52:19 +00:00
Victor Vieux
8015360eaf
update copyrights to 2015
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: e5869b2b0bdf85d15813c714565fd49943c3d754
Component: engine
2015-01-12 22:47:36 +00:00
Michael Crosby
d352fd4587
Merge pull request #9962 from andi5/fix-doc-cmdline-port
...
Fix order of pause and port in command line documentation.
Upstream-commit: 43a75f5b9332f4b3c002f79ea342b00127811b5b
Component: engine
2015-01-12 13:22:51 -08:00
Michael Crosby
e4632e05c1
Merge pull request #10051 from thaJeztah/fix-error-message
...
Fix typo in error-message.
Upstream-commit: 4e0f656d74a932e2b56bbb0a4529afb247b0fe06
Component: engine
2015-01-12 13:12:10 -08:00
Michael Crosby
b37502e6c0
Merge pull request #10019 from jfrazelle/9954-text-plain-content-type
...
Use "text/plain" content-type
Upstream-commit: 9215c3901eb8499f7bf86cf23512a451a951b449
Component: engine
2015-01-12 12:50:35 -08:00
Michael Crosby
Michael Crosby
Dan WalshandMichael Crosby
Tonis Tiigi
Jessie Frazelle
Ian CalvertandMichael Crosby
Jessica Frazelle
unclejack
Victor Vieux
Pierre Wacrenier
Alexander Morozov
Sebastiaan van Stijn
Tianon Gravi
Zoltan Tombol
Qiang Huang
Arnaud Porterie
HuKeping
Srini BrahmaroutuandSrini Brahmaroutu
AJ Bowen
Joffrey F
Victor Vieux