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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
aaf90d6259
Merge pull request #14570 from vdemeester/13365-ps-image-filter
...
Add docker ps ancestor filter for image
Upstream-commit: b1cb1b1df493b3e0b739b9f374b6c82e306dede8
Component: engine
2015-08-28 19:47:43 +02:00
4c1379a7d8
Merge pull request #15872 from lyndaoleary/find-an-issue-style-updates
...
Style updates to find an issue page
Upstream-commit: 279bbbedb2a8a3ddb9da5d5b3e82dbcc073e5a09
Component: engine
2015-08-28 19:18:19 +02:00
aa8f27039b
Merge pull request #15902 from SvenDowideit/add-more-tests-for-parsehost
...
Exploring the parsehost using unit tests
Upstream-commit: 50bcf17c39e96c1032eac9e8a450533f84129220
Component: engine
2015-08-28 09:14:35 -07:00
2eb78e33c8
Merge pull request #15910 from mimoralea/patch-1
...
Typo fix then -> than
Upstream-commit: e6e210164e48684c80008bbcce917de349253758
Component: engine
2015-08-28 18:09:26 +02:00
87ee7b8140
Merge pull request #15911 from calavera/carry_14296
...
[Carry 14296] Increased test coverage of pkg/httputils
Upstream-commit: 2a66beef7f66583c9d69b8de192abd25dca2ceaa
Component: engine
2015-08-28 09:04:43 -07:00
eeab72d8f5
Typo fix then -> than
...
Signed-off-by: Miguel Morales <mimoralea@hp.com >
Upstream-commit: 95e3a4ca6d7635e11d606a1011e0a55146c68460
Component: engine
2015-08-28 10:44:39 -05:00
d5c2dfe3ee
Merge pull request #15310 from MHBauer/demon-lint-squash
...
golint fixes for daemon/ package
Upstream-commit: 433956cc47c4cf7a52068c0518bd30ad044fa3b7
Component: engine
2015-08-28 17:34:36 +02:00
5950954f43
Merge pull request #15023 from hqhq/hq_add_status_in_inspect
...
Add status string to State field for inspect
Upstream-commit: 6caaa8a63544c052d757aecee93d3488b7b3d9e2
Component: engine
2015-08-28 08:27:36 -07:00
ed84a12688
Fix server header parsing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 243f98ff6de7aa16319be25c57ef1d910dfb6770
Component: engine
2015-08-28 11:06:24 -04:00
51511f9e16
unit test refactor in pkg/httputils as suggested by vdemeester; using pattern if x := …; x == nil {}
...
Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com >
(cherry picked from commit c3f1b2a5bd4a4330bcbad401c316af90925b99ad)
Upstream-commit: f753f6d597efb218d4b5786b9a4f09b6e73b48bc
Component: engine
2015-08-28 10:41:19 -04:00
208ac7a049
Increased test coverage of httputils to 70 %
...
Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com >
(cherry picked from commit d71817464e859cd323d6cdaf4dec5a9dd530f57e)
Upstream-commit: b3f999e86331b3c19572a88b5e123ea961ac54fb
Component: engine
2015-08-28 10:41:19 -04:00
d04df77c91
Exploring the code using unit tests - these 2 functions do not work consistently
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: e48a22282897c4755552fd79bf0d7af220116dc9
Component: engine
2015-08-28 10:29:52 +00:00
1870e3919c
golint fixes for daemon/ package
...
- some method names were changed to have a 'Locking' suffix, as the
downcased versions already existed, and the existing functions simply
had locks around the already downcased version.
- deleting unused functions
- package comment
- magic numbers replaced by golang constants
- comments all over
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: abd72d4008dde7ee8249170d49eb4bc963c51e24
Component: engine
2015-08-27 22:07:42 -07:00
ba189ea698
Style updates to find an issue page
...
* Fixed exp/beginner label colour background
* Added thead element to label table
* Updated issue list screenshot (old one referenced old whitebelt label)
* Content tweaks as per style guide
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com >
Upstream-commit: 6f22cc9b5c65b57bc9ca5a9dc56f30034b870510
Component: engine
2015-08-27 23:05:00 +01:00
56ea150002
Merge pull request #15778 from dharmit/13595-update-docs-process-interaction-container
...
Added note about process interaction with container in detached mode
Upstream-commit: fdc73cc3fc3166c2c78d70653c117f1573d47096
Component: engine
2015-08-27 22:39:20 +02:00
9802667a69
Merge pull request #15882 from vdemeester/14756-lint-opts-trust
...
Carry #14813 on linting package opts and trust
Upstream-commit: ba019dc0d0a89b3152fc3791495af2ddf18e173d
Component: engine
2015-08-27 15:58:13 -04:00
550ff739f5
Merge pull request #15893 from tonistiigi/fix-testsuite
...
Use DockerSuite for PullClientDisconnect test
Upstream-commit: 0ca2c3abf5030d92f45859aff6a66df54db092d2
Component: engine
2015-08-27 12:30:44 -07:00
190c9ba004
Use DockerSuite for PullClientDisconnect test
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9dd6c8822ddccff1952dfd611263ba551693ff7d
Component: engine
2015-08-27 11:22:54 -07:00
b3c7b9f038
Merge pull request #15822 from vdemeester/docs-update-filtering-ps-and-images
...
Update filtering chapters on ps/images references
Upstream-commit: 04b0fb631441b9dda4e9cb1a38b255bac65aa4e7
Component: engine
2015-08-27 10:39:20 -07:00
bab25931f6
Merge pull request #15646 from tonistiigi/15589-pull-cancellation
...
Fix pull on client disconnect
Upstream-commit: 0634c653d5214c7d8e5f1a154ce35d40ac8d25d7
Component: engine
2015-08-27 17:54:08 +02:00
a8d6119113
Finish linting opts and trust package.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0bd016b1c31f807169019d10a496144c34698431
Component: engine
2015-08-27 17:36:11 +02:00
cd1363a47b
golint: trust
...
contributes to #14756
Signed-off-by: Sevki Hasirci <s@sevki.org >
Upstream-commit: 5572148477ad069989bc3301e662cd6ee44832d2
Component: engine
2015-08-27 11:40:27 +02:00
c9cbc27779
Opts lint issues, ip and ulimit
...
Signed-off-by: Sevki Hasirci <s@sevki.org >
Upstream-commit: 6eb03c53db1f9e99a8fe7b006f4ab3214c022c01
Component: engine
2015-08-27 11:40:27 +02:00
3fac2ae98a
Updated to use correct cgroup paths
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com >
Upstream-commit: b582977bc8a7937a12b9064aa7fbe688b7d9c8fe
Component: engine
2015-08-27 10:39:37 +01:00
cdd3b53574
Merge pull request #15878 from brahmaroutu/vendor_netns
...
Allow vendoring netns changes to build Docker on s390x
Upstream-commit: 4579d5ac783df9d275fb616009cb6754efffe5ec
Component: engine
2015-08-27 10:02:25 +02:00
59e5fcdd6a
Update filtering chapters on ps/images references
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61de442c49a56f9fc6f82174c97e1229e8aa39f2
Component: engine
2015-08-27 08:47:03 +02:00
2133f70561
Added note about process interaction with container in detached mode
...
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Added note about process interaction with container in detached mode
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Upstream-commit: 9f8891a855c81d49bced308b9bc90640af0c5f01
Component: engine
2015-08-27 09:39:34 +05:30
54ef7aa45d
Merge pull request #15760 from mikebrow/9235-improve-documentation
...
Improvement to userguide/dockerrepos/ documentation
Upstream-commit: 44ea7e91fb1fc3e237ff6c70c2615f8cd919b8ff
Component: engine
2015-08-27 01:21:12 +02:00
4801e8999f
improvement to documentation
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: 5caccd27cd9903786898a336bd28fc50450f9eab
Component: engine
2015-08-26 16:49:31 -05:00
0143ca9eed
Merge pull request #15773 from charleswhchan/patch-3
...
Fix #14572 : Improve explaination for using `RUN` command inside Docke…
Upstream-commit: 5e8038d0b0e4f1af43a0daecc4775375721d1051
Component: engine
2015-08-26 14:19:44 -07:00
248e0595b9
Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion
...
remove btrfs subvolumes when destroying containers (recursive)
Upstream-commit: 459c2c66c3c168364f90532811c96c80e8153822
Component: engine
2015-08-26 14:00:53 -07:00
e191a06015
Add 'ancestor' ps filter for image
...
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c1af0ac0820d1385fe2ee65593b0558840395c7b
Component: engine
2015-08-26 22:59:48 +02:00
c09d503a17
Merge pull request #15826 from Microsoft/start-from-one
...
Builder counts from 1
Upstream-commit: 7a74422724ef3a4ae33f6bcd45ce908be279e476
Component: engine
2015-08-26 13:59:38 -07:00
4602da3b1b
Merge pull request #15493 from stevvooe/no-buffer-on-push
...
Avoid buffering to tempfile when pushing with V2
Upstream-commit: 70a814c3f378a5873aedf3be85397272de4f6672
Component: engine
2015-08-26 13:59:01 -07:00
2dc587d949
Merge pull request #15843 from MHBauer/version-order
...
reweight api doc for v1.21 to correct the order.
Upstream-commit: ea65c38ac0972709cdb371ce6b1886eb252a126e
Component: engine
2015-08-26 13:51:06 -07:00