Tibor Vass
7db3a64e57
Merge pull request #16060 from vdemeester/14756-lint-pkg-term-windows
...
Lint pkg/term/windows package
Upstream-commit: 07d2eae6d57ecdac82fa41ad342b6bb21d537848
Component: engine
2015-09-03 19:54:20 -04:00
Vincent Demeester
ff114b4d32
Lint pkg/term/windows package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3409de971c7bd3c84c324d19f422fcb3c6777f02
Component: engine
2015-09-03 22:25:52 +02:00
Michael Crosby
2f2b355be9
Merge pull request #16038 from aboch/sbx
...
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
Upstream-commit: 288275ab60c049fa644f1ce5d36c0c005e8dd02c
Component: engine
2015-09-03 11:48:02 -07:00
Alessandro Boch
2a15577401
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
...
Main changes in this vendoring are to allow user name space integration in docker.
And it includes major fix for network namespace handling
Signed-off-by: Alessandro Boch <aboch@docker.com >
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 414dfbf681d956c11c83d9b7598962a1294f2c5d
Component: engine
2015-09-02 16:57:43 -07:00
Jessica Frazelle
5fbd39445a
use apt-ftparchive and reprepro to enable apt-pinning;
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 12a71c8954cb51985243cb1afc2841cf7f4ce0a2
Component: engine
2015-09-02 09:32:24 -07: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
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
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
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
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
David Calavera
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
Morgan Bauer
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
John Howard
2a282eed74
Windows: Revendor HCSShim with godoc
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
Upstream-commit: 5a5f9e93e9134378ffb5d0294577875a0d8c1937
Component: engine
2015-08-27 15:46:00 -07:00
Vincent Demeester
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
Srini Brahmaroutu
300f8e6fef
Allow vendoring netns change to build Docker on s390x
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: eecf6cd48cf7c48f00aa8261cf431c87084161ae
Component: engine
2015-08-25 15:07:17 +00:00
Tianon Gravi
590a40fb3c
Update dind "/tmp" mounting to be optional
...
This allows someone running the image to use `-v` to mount a non-tmpfs `/tmp` into their image if they so require/desire.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b8bed8832b77a478360ae946a69dab5e922b194e
Component: engine
2015-08-21 15:47:50 -07:00
Jessie Frazelle
ec7a94a85c
Merge pull request #15492 from vbatts/update-tar-split
...
vendor: update tar-split to v0.9.6
Upstream-commit: e5e6eaacee75933c074e02aa2663c69a30e51027
Component: engine
2015-08-21 14:45:19 -07:00
Jessie Frazelle
ad05d1ea8d
Merge pull request #15125 from WeiZhang555/golint-stdcopy-system
...
fix golint warnings/errors on pkg/system and pkg/stdcopy
Upstream-commit: ecff4badcd98f749e5bd8511fbf4ca2c605db96c
Component: engine
2015-08-21 14:27:59 -07:00
Jessie Frazelle
7ec0d0652b
Merge pull request #15596 from jfrazelle/hack-dind-its-been-fun
...
docker 1.8+ no longer needs dind
Upstream-commit: 9d22c7a2d561e2b8379b8cf890d5873d529cd122
Component: engine
2015-08-21 13:51:41 -07:00
Jessica Frazelle
74f373df66
update hack/dind for 1.8 mounting of cgroups
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c48ac77840f1aa22a76428e2451ca1ae9cf85a48
Component: engine
2015-08-21 11:13:33 -07:00
Srini Brahmaroutu
d3fcc3f0db
daemon/graphdriver fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 9e1a41aae53a9f9fb260c3666db2d4228ea4f50b
Component: engine
2015-08-17 19:27:36 +00:00
David Calavera
d9d9dff9a7
Merge pull request #15579 from Microsoft/10662-graph
...
Windows: Graph remove custom interface, add central store
Upstream-commit: 2e7b088164960b7981a058f34336c05dc52f2c53
Component: engine
2015-08-17 10:45:48 -07:00
Stefan J. Wernli
73f39654a9
Windows: Graph remove custom interface and add central store
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Windows: add support for images stored in alternate location.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: dfbb5520e3b35030f3eef38d5a2d86ad20ea0a2f
Component: engine
2015-08-14 23:45:53 -07:00
Jana Radhakrishnan
7c6dc2bb99
Vendoring in vishvananda/netlink
...
Updating netlink package to 4b5dce31de6d42af5bb9811c6d265472199e0fec
to fix certain wierd netlink issues seen.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 7948b755c77a3901ffb5b397659c72ae4e6f4340
Component: engine
2015-08-14 18:02:58 -07:00
Madhu Venugopal
89380524e8
Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3
...
Notable changes include :
- #285 : Fix required for https://github.com/docker/docker/pull/12927
- #283 : Code re-architecture/tech-debt in bridge driver
- Upgraded to latest Netlink library
- Fixed certain race-conditions
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 703e2264bae99784496794365ea72348715e7c70
Component: engine
2015-08-14 05:57:47 -07:00
Arnaud Porterie
b4d25ce7ed
Merge pull request #14758 from Microsoft/10662-pipestohcs
...
Windows: [TP3] new hcsshim stdin/out/err handling
Upstream-commit: 693ff58cd2db719884577c7573e7f74ade8a3e50
Component: engine
2015-08-13 22:52:48 -07:00
Jessie Frazelle
53cf427573
Merge pull request #15367 from hqhq/hq_update_rpm_deb_desc
...
Tiny fix for rpm and deb descriptions
Upstream-commit: 46d9fd6a11968e53bf18677ab9a44f3aec4edf21
Component: engine
2015-08-13 15:04:50 -07:00
John Starks
84c4707817
Windows: new hcsshim stdin/out/err handling
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ec5a73d18eb6a5241cdaa0b5d473abb085d6f491
Component: engine
2015-08-13 13:09:42 -07:00
Vincent Batts
28a6204b27
vendor: update tar-split to v0.9.6
...
Fixes rare edge case of handling GNU LongLink and LongName entries.
Perf improvements. /dev/null writes were taking CPU time during docker
push. Thanks @LK4D4
Various cleanup too.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 4ce24eb73af8f9e05d51c6c50a297d063eb641a1
Component: engine
2015-08-13 15:42:01 -04:00
Zhang Wei
5e176c5f47
fix golint warnings/errors on pkg/system and pkg/stdcopy
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 7e420ad8502089e66ce0ade92bf70574f894f287
Component: engine
2015-08-13 18:47:13 +08:00
Jessie Frazelle
427a5313d8
Merge pull request #15183 from jfrazelle/test-install-script
...
add file to test install script
Upstream-commit: e82358586d62413c598b81df4c2d9af6045ee53d
Component: engine
2015-08-12 09:49:35 -07:00
Jessie Frazelle
090c29f3a8
Merge pull request #15377 from jfrazelle/do-not-keep-old-experimental-debs
...
do not keep old debs for experimental
Upstream-commit: 13873e6841367dc5d00f641e9a5eac967e7aa203
Component: engine
2015-08-11 16:35:55 -07:00
Jessica Frazelle
313dca405d
fix oracle linux install
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 0eade329dc1b75424dfc71a110d1848498b3d153
Component: engine
2015-08-11 16:33:14 -07:00
Jessica Frazelle
988c46b306
add file to test install script
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 83416f68deb6ff94ffa1803b90bb9a9cd4e2ca78
Component: engine
2015-08-11 16:31:58 -07:00
Jessica Frazelle
c0287afaeb
minor cosmetic change to client output on pull
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 8bd632276069d7057406aa6ea151296cf5bbbd2f
Component: engine
2015-08-10 21:54:03 -07:00
Jessica Frazelle
817f075302
make windows cross compile static daemon work
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: e62745922feb580b3687571bb4c52db3de5157f7
Component: engine
2015-08-10 16:16:58 -07:00
Brian Goff
2db4446de9
Merge pull request #15445 from hqhq/hq_use_docker_daemon
...
Change all docker -d to docker daemon
Upstream-commit: 51249a3aa09b8e1ade07ed6be0029a190b978b05
Component: engine
2015-08-10 10:35:19 -04:00
David Calavera
b49d2589a1
Merge pull request #15426 from BenHall/15425-set-e-install-script-fix
...
Fix install.sh to handle non-zero exit codes when checking lsb_release
Upstream-commit: ba0eba69603e3a000d269c6363a58c5107862193
Component: engine
2015-08-10 08:47:19 -05:00
Qiang Huang
8120b4d8fe
Change all docker -d to docker daemon
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 81cc8ebc93c20537d5fab4c016a3774f58b3e483
Component: engine
2015-08-10 20:48:08 +08:00
Qiang Huang
a29927b8e9
Tiny fix for rpm and deb descriptions
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: ff97bc79cb5638aec8f03efaa3550e36e106975c
Component: engine
2015-08-10 09:34:10 +08:00
Brian Goff
89ab9698f7
Merge pull request #15074 from coolljt0725/14756_enable_golint_2
...
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
Upstream-commit: 764aa1a583ba6f73a32af1ba064401967cb716b6
Component: engine
2015-08-08 07:14:53 -04:00
Ben Hall
724e66acf4
Fix install.sh to handle non-zero exit codes when checking lsb_release
...
Signed-off-by: Ben Hall <ben@benhall.me.uk >
Upstream-commit: 3b28bada0af08993508af8658d56c15b17ec6fb7
Component: engine
2015-08-08 11:44:52 +01:00
Lei Jitang
305eb65786
Enable golint in pkg/jsonlog and pkg/jsonmessage.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 5220f3b535ce38edbff616bc78f1eb92148d310e
Component: engine
2015-08-08 11:28:22 +08:00
Veres Lajos
2c6e673ce7
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com >
Upstream-commit: 514623272398574c8fd7ef3fe42c5b2ae161349a
Component: engine
2015-08-07 23:25:49 +01:00
Alexander Morozov
130868c480
Merge pull request #15416 from vdemeester/lint-remove-pkgsystemd
...
Remove pkg/systemd from validate-lint
Upstream-commit: 7ac357c7954283b29276044cb4225551c0f4d8d3
Component: engine
2015-08-07 14:31:12 -07:00
Vincent Demeester
8af88451b7
Remove pkg/systemd from validate-lint
...
Following #15330 , pkg/systemd doesn't exists anymore.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b8559991dcc97c3defee89ed70c3b616152ef583
Component: engine
2015-08-07 22:26:45 +02:00
Srini Brahmaroutu
d20356ab98
daemon/graphdriver/overlay/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: de3944219f23ffe3ac83add4c1f2b0ec0a4cd5c0
Component: engine
2015-08-07 18:34:59 +00:00
David Calavera
c8706706f4
Merge pull request #14897 from WeiZhang555/golint-api-types
...
fix golint warnings/errors on package api/types/
Upstream-commit: 0a0e9701f7bbe58e75eff9d1934fde0a5038ee9c
Component: engine
2015-08-07 10:51:27 -07:00
David Calavera
8778d71536
Merge pull request #14828 from brahmaroutu/lint_graph_tags
...
/graph/tag fix lint errors/warnings
Upstream-commit: b1009d1fdd551a57e7c266d9cc8122ed3f80aa2c
Component: engine
2015-08-07 10:49:26 -07:00