Commit Graph
18382 Commits
Author SHA1 Message Date
Ma Shimiao 180469a2a4 daemon/commit: remove unneeded code
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: ab868ad79c631b2606b479edf12d287b986c72d4
Component: engine
2015-09-01 16:34:07 +08:00
Vincent Demeester 7dbe195606 Add docker ps --filter=… image completion
I missed that on #15919, thanks @albers

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6ae2cb7ad1aea951d50094638f386f78de57080c
Component: engine
2015-09-01 08:47:02 +02:00
Sebastiaan van Stijn 3a8dcfcfb5 Merge pull request #15969 from charleswhchan/issue-15939
Fix issue #15939: Hyperlink to MongoDB Dockerfile not found. 
Upstream-commit: d080f6524b22ebb333efb1668f47e7e5510be44d
Component: engine
2015-09-01 08:33:22 +02:00
Charles Chan cada1c181e Fix issue #15939: Hyperlink to MongoDB Dockerfile not found. Replaced with link to file in Github.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: f814ae437fa622c185e544d24bf0662b2337c91a
Component: engine
2015-08-31 19:28:36 -07:00
Alexander Morozov b060726a85 Merge pull request #15963 from Microsoft/fix-unixtestport
Move TestPort out of _unix
Upstream-commit: 84bc41a3fb8a0150448caca8f5f4d7f1a00e23b3
Component: engine
2015-08-31 17:09:59 -07:00
Doug Davis 45692d9652 Merge pull request #15966 from Microsoft/test-typo
Fix typo in test title
Upstream-commit: 0f878cfa00d4c4c7a4aac2e3dcd73a72a11c0afe
Component: engine
2015-08-31 18:59:55 -04:00
Tonis Tiigi 075e783df0 Fix goroutine leak on pull
Close the pipeWriter even if there was no error.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3037e4f7c4eec06cf3a5afca6f58ec58b4bdd63e
Component: engine
2015-08-31 15:56:19 -07:00
John Howard 8216c91a01 Fix typo in test title
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3c2b128582bc8ea786b5486578c43d97167805fe
Component: engine
2015-08-31 15:28:40 -07:00
John Howard dece7c3355 Move TestPort out of _unix
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 68c7d24a12ca54d052cdc033c06f27c19ee5bab0
Component: engine
2015-08-31 14:40:36 -07:00
David Calavera 5450845f26 Merge pull request #15827 from williamh/fix-openrc-script
Fix openrc script
Upstream-commit: 166412e529b3d2d49456fb27c117fa714d7aec16
Component: engine
2015-08-31 20:32:00 +02:00
Sebastiaan van Stijn 156b9cd3aa Merge pull request #15926 from moxiegirl/carry-15210
add: best practice for security when sharing host directories.
Upstream-commit: c844effeda1af144eee964e62528d7b362bb33a3
Component: engine
2015-08-31 19:51:15 +02:00
Mary Anthony c29130b3da updating again.
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7271dca8cc4570a28feba5a45153497dd452d899
Component: engine
2015-08-31 09:56:35 -07:00
Mary Anthony 50f9987d87 Updating with SEb's comments
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 95495d20bec49ae338e6fc10f5d4be71bd162370
Component: engine
2015-08-31 09:54:15 -07:00
David Calavera 472d3d817f Merge pull request #15922 from unclejack/lower_reset_timeout_bufreader
pkg/ioutils: lower bufReader reset timeout
Upstream-commit: 3bd8016259711c951bd9b2023c176f7825c5d56c
Component: engine
2015-08-31 18:43:45 +02:00
Arnaud Porterie 4e8cadcb64 Merge pull request #15489 from aaronlehmann/pull-updates
Show pull progress in terminal for inflight pull requests
Upstream-commit: 84614fdae00fbdb66b5ae6de1c8246c470ef4f5c
Component: engine
2015-08-31 09:37:33 -07:00
moxiegirl 4d130b40c6 Merge pull request #15920 from mikebrow/docker-engine-update-to-index
Adding additional instructions to the Docker Engine installation/inde…
Upstream-commit: 38ac1f908e07877a1b2d26f73755a45b2ceb240c
Component: engine
2015-08-31 09:35:34 -07:00
LIZAO LI 07ea70de30 add: best practice for security when sharing host directories.
Closes and carries PR #15210
Updating with Seb's comment

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b0fd4f882fd9b8c38a004395ea44b32f06431345
Component: engine
2015-08-31 09:32:42 -07:00
David Calavera cd128eab1d Merge pull request #15606 from jlhawn/img_delete
[daemon] Refactor image_delete.go
Upstream-commit: 96974170f8ca82dedffbfe54e84b6b1b2f5661d2
Component: engine
2015-08-31 18:22:48 +02:00
John Howard e382bc454d Test infrastructure for cross platform
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: cd18e7bb739b7681507aca48fec36db9104a5e89
Component: engine
2015-08-31 09:10:18 -07:00
Alexander Morozov 76c45eaf41 Merge pull request #15918 from duglin/HttpHeaderTests
More httputil tests for the docker header
Upstream-commit: 4ae81e145e9e44ee683597e0d6af13b11086fb5c
Component: engine
2015-08-31 08:48:28 -07:00
Jessie Frazelle 456b829615 Merge pull request #15954 from jfrazelle/no-t-install-script
we dont need the tty in the install script
Upstream-commit: 3272b3d120fd4ce77a0ac0c8fb6481a6e316e873
Component: engine
2015-08-31 08:45:35 -07:00
Brian Goff aa64926347 Merge pull request #15807 from coolljt0725/remove_remove_redundant_tag_name
Minor fix: remove redundant tag name in error message of create failed.
Upstream-commit: 754c10430b1d0e6247e2cdd150bc15291ff87de0
Component: engine
2015-08-31 11:34:40 -04:00
Mike Brown 757943440e Adding additional instructions to the Docker Engine installation/index page per discussions with @moxiegirl.
Removed the "Other Linux" heading; Changed the "Next Steps" heading to "Where to go After Installing"

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: e9eaef6f1e85e949980806e979416c8fb03af2b9
Component: engine
2015-08-31 10:25:41 -05:00
Jessica Frazelle ee4aaae33c we dont need the tty in the install script
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 80c32162b5e99e1237a31cead3774474407fe0cf
Component: engine
2015-08-31 08:12:01 -07:00
Sebastiaan van Stijn ecc0f185b2 Merge pull request #13266 from shishir-a412ed/docker_lvm_devmapper_loopbackdevices
Warning message for lvm devmapper running on top of loopback devices
Upstream-commit: 81d6f350f70194a66d6db025e456b37ee8704b94
Component: engine
2015-08-31 16:40:16 +02:00
Shishir Mahajan 743472f299 Warning message for lvm devmapper running on top of loopback devices
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 4870fb36d4ab1ef221cdcd95644cb19f6da0217a
Component: engine
2015-08-31 10:35:48 -04:00
David Calavera f2ca32df70 Refactor daemon container list.
Separate container iteration, filtering and reducing.
This will make easier in the future to improve the implementation of
docker ps as we know it.

The end goal is to unify the objects returned by the api for docker ps
and docker inspect, leaving all docker ps transformations to the client.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 06699f73fb6d779894a875f9177afc5a1f3bc5b3
Component: engine
2015-08-31 04:24:08 -04:00
David Calavera f57ea43d07 Merge pull request #15873 from cpuguy83/no_args_for_volume_subcmd
Fix `docker volume invalidarg` so it displays usage
Upstream-commit: 754d81bd69801a25e1b0d2d51bb2c20c8771c01b
Component: engine
2015-08-31 10:04:45 +02:00
David Calavera b28531b76b Merge pull request #15901 from Microsoft/10662-revendorhcs
Windows: Revendor HCSShim with godoc
Upstream-commit: 998699316caadc28588c710592f809dc209cd2c3
Component: engine
2015-08-31 10:03:18 +02:00
David Calavera 81a4c5d90f Merge pull request #15919 from vdemeester/14570-contrib-completion
Update shell completion on docker ps for ancestor
Upstream-commit: d6a94fbf22cb80d80d783fff2768b3eff579d248
Component: engine
2015-08-31 09:58:05 +02:00
David Calavera f85cba2018 Merge pull request #15914 from dmcgowan/fix-upload-sanitize
Fix sanitize URL bug on layer upload
Upstream-commit: 9703c3a90e673ced82b640f87674331b0a253208
Component: engine
2015-08-31 09:35:28 +02:00
xlgao d30ce2eec5 just check -v /src:dest and test it
Signed-off-by: xlgao <xlgao@zju.edu.cn>
Upstream-commit: 50be74ba1479278cc220633365cdd1c5a21d7cda
Component: engine
2015-08-31 10:50:49 +08:00
Vincent Demeester 37075934c3 Add jenkins and godoc badges
Build badges are for master and one for experimental (in the `README.md`
of the experimental folder)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 10005433eb3434d3f59ad99030591e5b1d8fc692
Component: engine
2015-08-30 21:31:13 +02:00
xiekeyang e9d8afb4a3 Fix: Docker Daemon didn't send actual actions client ask for to Token Server
The Docker Daemon should send actual actions client ask for to issue tokens,

not all the permissions that client is guaranteed.

Signed-off-by: xiekeyang <xiekeyang@huawei.com>
Upstream-commit: e451ddbf4657cbe72f539e1f9513a5bc3a31f3d6
Component: engine
2015-08-30 16:40:26 +08:00
Lei Jitang 58471ed642 Minor fix: remove redundant tag name in error message of create failed.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 16220e06810c38b8e531c3508221458ffb330e97
Component: engine
2015-08-30 10:43:33 +08:00
James Turnbull a76fd41e6b Merge pull request #15932 from lyndaoleary/15909-daemon-flag
Removed deprecated -d flag from docs
Upstream-commit: e137f2d08187550393048295d8238dc18fe2e06f
Component: engine
2015-08-29 22:10:35 -04:00
Sebastiaan van Stijn 61e5f6c420 Merge pull request #15929 from jjn2009/patch-1
ubuntu-14-10-x64 is not a valid image on digital ocean
Upstream-commit: ad91d2e97a5258329064adb58483a757498b7979
Component: engine
2015-08-30 02:54:16 +02:00
Sebastiaan van Stijn c9c72002bd Merge pull request #15925 from moxiegirl/carry-14234
Closes #14234 and updates text
Upstream-commit: bace51571fb03f00389c7d5d4dc41ea2d6df7616
Component: engine
2015-08-30 01:33:57 +02:00
Lynda O'Leary 63195963e6 Removed deprecated -d flag from docs
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com>
Upstream-commit: 55468e2ac40f133e2ca4d1d65420cc54368a7aa4
Component: engine
2015-08-29 23:31:27 +01:00
moxiegirl dc81afc8d4 Merge pull request #15885 from tombee/7866-10463-runmetrics-doc-updates
Updated runmetrics article to use up-to-date cgroup paths
Upstream-commit: fd1b21b646ab3fe5d35fd1417624d5ed73045bf6
Component: engine
2015-08-29 13:36:20 -07:00
Mary Anthony 3676b67f73 Closes #14234 and updates text
Updating with Seb's comments
Entering Sven's comment

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 2920550211f8829b61107f7aaebbabdcaba761b3
Component: engine
2015-08-29 13:15:36 -07:00
Arnaud Porterie f4c19b3e51 Merge pull request #15832 from jfrazelle/add-docker-seliux-policy-for-rpm
Add docker seliux policy for rpm
Upstream-commit: 626c05036cbb28a45511da8cd592e6589200d245
Component: engine
2015-08-29 11:07:20 -07:00
Sven Dowideit 5a287b0f3a Change ParseTCPAddr to use tcp://127.0.0.0:2375 format as default consistently
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 3d510f15da32a98a22f84a0f1afa250cc277488d
Component: engine
2015-08-29 11:23:51 +00:00
Jordan be43df1c91 ubuntu-14-10-x64 is not a valid image on digital ocean
Signed-off-by: Jordan Jennings <jjn2009@gmail.com>
Upstream-commit: 24c4594cc308666baaec224b0905b43c5111a948
Component: engine
2015-08-28 23:59:30 -07:00
Jessica Frazelle 121bb4177c add selinux-policy and docker-engine-selinux rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8fe675d7992cd44281669e40a33d239dfe8e97e1
Component: engine
2015-08-28 17:54:04 -07:00
Jessica Frazelle aa25376ef2 add build deps for selinux-policy/selinux-policy-devel
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 42d8fe610548843376f035e1649444178f8497fb
Component: engine
2015-08-28 17:43:30 -07:00
Jessica Frazelle 634e092800 update spec file to require docker-engine-selinux policy
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: df6d92837029411bd06c4541c08c20127ce8327e
Component: engine
2015-08-28 17:43:30 -07:00
Derek McGowan a2dd40c398 Fix sanitize URL bug on layer upload
Update the distribution version to include sanitize URL fix

Fixes #15875

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: b1c1f42bccccef5fc407c3bec7d25a60f91af035
Component: engine
2015-08-28 14:35:06 -07:00
Brian Goff 5af488a476 Merge pull request #15917 from srust/volume_create_dont_lock_around_volume_driver
Don't hold lock around volume driver for volume create.
Upstream-commit: 0b2cff35bac7a469b4e7ba0abe70e950cfc3c80c
Component: engine
2015-08-28 17:13:47 -04:00
Stephen Rust a9bff20ad7 Don't hold lock around volume driver for volume create.
Signed-off-by: Stephen Rust <srust@blockbridge.com>
Upstream-commit: 0ef740a5bf093aa544802ccfbb0612e04ed8492a
Component: engine
2015-08-28 16:28:28 -04:00