1c1efd72ec
Vendor in libnetwork changes to support container rename
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 1041f3967086052438a3e34cee3db14e2277b629
Component: engine
2015-10-23 16:27:03 -07:00
7c4b8bccf9
Merge pull request #17381 from mavenugo/rc3v1
...
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Upstream-commit: 91de5ddf1896347c05f5292b8a0de0fbad3e4ce2
Component: engine
2015-10-26 17:06:01 -07:00
b67a8a66b5
Merge pull request #17285 from Microsoft/10662-exectp4workaround
...
Windows [TP4] Trap Hyper-V exec failure
Upstream-commit: fe1e04a84f51b3abf5fd426a6a4ee0125683aa11
Component: engine
2015-10-26 16:47:51 -07:00
641ecc1ebd
Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install
...
apparmor check version on deb install
Upstream-commit: 9312a738d84e880bf4635ba4b7729b3c2e017fbc
Component: engine
2015-10-26 22:44:11 +01:00
0759578039
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 139d1e13e29ed987face1494471fdb6c986d6c4a
Component: engine
2015-10-26 13:56:56 -07:00
878c53917a
Windows [TP4] HCSShim Revendor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a3c43964cf994cc1315af1590155f63dc588e32c
Component: engine
2015-10-23 08:41:30 -07:00
c31c8acf2e
Vendoring in libkv to be aligned with libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 793b20ba093acedfb53ea2a3344601322e97893f
Component: engine
2015-10-22 14:12:46 -07:00
58a78457b3
Vendoring in Libnetwork
...
This carries fixes for
- Internal racy /etc/hosts updates within container during SD
- Renable SD service record watch after cluster-store restarts
- Fix to allow remote IPAM driver to return no IP if the user prefers
- Fix to allow --fixed-cidr and --bip to be in same range
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 52df87ac2b83693a48efcdc7167575449f122e25
Component: engine
2015-10-22 14:12:46 -07:00
95b57bebf2
Merge pull request #17274 from aboch/ai
...
Turn off discovery when icc == false
Upstream-commit: 2afdc6582b203c2beaeaca6ff14f61ae50f8cab9
Component: engine
2015-10-22 13:08:31 -07:00
389b888060
Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest
...
RPM change install location of Fish completions
Upstream-commit: af6743a6c61b3c854d647975bca3f826ec654b20
Component: engine
2015-10-21 14:36:50 -07:00
7356782f88
Merge pull request #17145 from thaJeztah/deb-add-fish-completions
...
deb: add fish completions
Upstream-commit: 08fb49597563e66d708098b4391ad7e13d3e619d
Component: engine
2015-10-21 13:58:22 -07:00
c0edcf2339
release: fix bash bug in script
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 420e07cc2c8189cb3c1f361aa0c1c1d1156b9eda
Component: engine
2015-10-21 16:02:14 -04:00
2bfb10b6f8
Vendoring in libnetwork for the anonymous endpoint
...
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 1be540b99bdf7557d4c3183b822b5bea230b0141
Component: engine
2015-10-21 09:32:48 -07:00
b1184809c8
Merge pull request #17229 from mavenugo/ds_fix
...
Fixing bootup inconsistencies due to invalid cluster-store config
Upstream-commit: bb5551746bdccc1b032fbf8c32914c282ff94668
Component: engine
2015-10-21 12:00:07 -04:00
82f86233a6
Vendoring in libnetwork to fix daemon bootup instabilities
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 2de2192c27bf72e5036e9914b984ab6d71f70c60
Component: engine
2015-10-20 19:56:59 -07:00
72a0fc71b0
some bugfixes on getting tuf files, this is backed by a lot of new unit tests in gotuf
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
Upstream-commit: 43ba8a0426e9414c936d6f5fdab9bb0311fb7b8c
Component: engine
2015-10-20 13:22:06 -07:00
c19683280b
Merge pull request #17188 from jfrazelle/fix-release-rpm
...
fix copy of multiple rpms
Upstream-commit: a7868191d43f4a0f73bf792973869f3df5dc8d37
Component: engine
2015-10-20 11:31:35 -07:00
f3edec8c49
Vendoring libnetwork
...
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052
Has bug fixes for 1.9
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 9750dd0088bbb23968a19a74f5ae8c58b56328fc
Component: engine
2015-10-19 21:29:26 -07:00
2b52981204
add test script for built debs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 14e85c8c556bae67584e71f5c4bb6322c77a3ef5
Component: engine
2015-10-19 16:15:27 -07:00
ee5b4b81d9
add generate aa profile to deb install
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 8369f00d30cc1d7823723dec6147f0419e67ad46
Component: engine
2015-10-19 16:15:25 -07:00
3fd414a4f5
fix copy of multiple rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: f549b1c9ea7ff99f9f17e59d65f234d93e85c36c
Component: engine
2015-10-19 16:14:06 -07:00
56a008d359
deb: add fish completions
...
This adds the Fish completions to the .deb package.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6b1a643ac8bf599d04510b26d6d5befefc30ccde
Component: engine
2015-10-17 23:28:11 -07:00
d1e9f4d92c
RPM change install location of Fish completions
...
External completions for fish should be installed
in /usr/local/share/fish/vendor_completions.d to
not conflict with built-in completions.
for reference, see:
https://github.com/fish-shell/fish-shell/issues/1485
fixes #16668
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fb372e66bb9b52bb57d15de04d8af4b94c9e0c14
Component: engine
2015-10-17 22:58:09 -07:00
c93afd4f9e
Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build
...
Vendoring new go-check checkers and use checker for docker_api_build_test.go
Upstream-commit: cffd50752c2b2243519193a4ca458156291eb8af
Component: engine
2015-10-17 08:50:51 -07:00
e7f314a486
Vendoring shakers library and update go-check
...
The shakers library defines a bunch of go-check checkers to ease
writing tests.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9685b4767fc49c4a43ba762a5afbcd175f3d9245
Component: engine
2015-10-17 14:28:08 +02:00
dabf81be3c
Merge pull request #16831 from jfrazelle/release-updates
...
Release updates
Upstream-commit: e3fabf3ea1548afa3d147eb6f41b8656a70569b7
Component: engine
2015-10-16 16:57:10 -07:00
f246159061
Merge pull request #17046 from mavenugo/dopts
...
driver-opts for network create
Upstream-commit: 365a0db0f0f105306a8553405fb68a207e8d7754
Component: engine
2015-10-16 15:23:59 -07:00
146e9ba09f
Merge pull request #16574 from Djelibeybi/rpm-changelog
...
Generate a full RPM changelog from the existing CHANGELOG.md file
Upstream-commit: 3668be932e0b3fccd3cde0cff20192c123227a98
Component: engine
2015-10-16 14:55:39 -07:00
b9ef35ce38
Vendoring libnetwork to Replace the label variable to DriverOpts
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: cf1b5fe6011e49d19e2b27792d6f28fd6cd8984e
Component: engine
2015-10-16 14:30:57 -07:00
98ece668a9
updating notary and gotuf with latest bugfixes
...
Signed-off-by: David Lawrence <david.lawrence@docker.com >
Upstream-commit: 7ce9f0275130b66241f9077485d14e25c641cc3d
Component: engine
2015-10-16 09:33:26 -07:00
30e90c5ea6
Merge pull request #16997 from Microsoft/10662-kill-parttwo
...
Windows: [TP4] docker kill handling part two
Upstream-commit: e1804098b9c9ebb6210af29045198bd5259bb834
Component: engine
2015-10-15 14:42:19 -07:00
6d357aac9c
Merge pull request #16221 from flavio/get-docker-update-suse-installation
...
Update SUSE/openSUSE installation script
Upstream-commit: b22f89cb770ca54e219cb7c5aac590b13ed606d1
Component: engine
2015-10-14 13:02:45 -07:00
7ca814e803
Update SUSE/openSUSE installation script
...
Fix installation on SUSE Linux Enterprise machine, the updated Docker RPMs have
been moved to a different location.
Update both openSUSE and SUSE Linux Enterprise scripts to allow the
installation of experimental builds.
Signed-off-by: Flavio Castelli <fcastelli@suse.com >
Upstream-commit: 400ac8a66cf3c40f162153dcecd44b4fa8e3453f
Component: engine
2015-10-14 20:55:28 +02:00
1dd7cd942b
Merge pull request #16989 from tiborvass/bump-libcontainer-for-docker-1.9
...
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
Upstream-commit: 3ad9cc996a3daf0c3f05972141bdfc6d8126d705
Component: engine
2015-10-13 16:56:19 -07:00
803f14d503
Windows: [TP4] docker kill handling
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bc503ca8ab2303066cc64d752ffff05100a9b267
Component: engine
2015-10-13 16:04:49 -07:00
095021089e
Merge pull request #16863 from dhiltgen/bump_libkv
...
Bump to latest libkv + dependencies
Upstream-commit: 9c94dcea3dbbe09fbd90e763bfbf19d687bff6c0
Component: engine
2015-10-13 15:57:42 -07:00
055fc64475
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: a17e53038d15ebb82f2dcdafb5c429609cccfb0d
Component: engine
2015-10-13 15:48:13 -07:00
d72c4d5a02
update release-deb from the reprepro stuff we don't use
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 3057f0f0a7edd4d38485c5528cc2c991240e6b1c
Component: engine
2015-10-13 15:42:39 -07:00
22d67b7818
Bump to latest libkv/libnetwork + dependencies
...
The latest libkv uses a different etcd library. Unfortunately
that library uses some funky import paths, so I've added a new cleanup
routine for our vendor scripts to be able to normalize the imports
to be consistent with how imports work in this tree.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 7078e7ddf42ad0beeb61e82cb1544d74def98adf
Component: engine
2015-10-13 14:41:43 -07:00
0e3861a2d2
Merge pull request #16910 from mavenugo/ipam
...
Vendoring libnetwork for the pluggable IPAM driver support
Upstream-commit: 4ea3ff70618d28520d2ae787bd00206d05c9f1db
Component: engine
2015-10-13 14:41:19 -07:00
b5732f7da4
Vendoring in libnetwork ipam support
...
* Pluggable IPAM driver support
* Performance and Scalability enhancements
* Libkv fixes in multiple backend stores
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 2e3113aeef08c9e7fa4f9cb0fd3d53185d492b99
Component: engine
2015-10-13 10:52:49 -07:00
898a6db0e5
Missing a single dash in error message
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 4e899d64e020a67ca05f913d354aa8d99a341a7b
Component: engine
2015-10-11 22:46:14 -07:00
36fdf8f132
Merge pull request #12648 from estesp/userns-impl
...
Phase 1 implementation of user namespaces as a remapped container root
Upstream-commit: ed9434c5bb64f49db442027e5e748bfbb46d0a0a
Component: engine
2015-10-10 11:38:07 -07:00
be4b863cca
Merge pull request #16895 from vdemeester/ocd-validate-typo
...
Fix few comments in validate scripts
Upstream-commit: a6bbf16aa1f8246f6979eaebf213e549e75b7b90
Component: engine
2015-10-10 12:08:37 +02:00
ec720a54c6
Fix few comments in validate scripts
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1ce9be346b0d4df3b9b4fdf521b1cbb9cb111fc0
Component: engine
2015-10-10 11:21:04 +02:00
9b28670308
fix logic because jess is the worst
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 930b27a86bf02969600259ce3a5d3fcff10edcb5
Component: engine
2015-10-09 22:21:24 -04:00
e36eec68dc
Update integration test userns support with flag name change
...
`--root` is now `--userns-remap`
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: a85e6a4d4a5afc866b153e46e19ed3c15d3a24ec
Component: engine
2015-10-09 20:52:45 -04:00
29fa44dc8c
add test-integration-cli specifics for userns
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ea3afdad612448fc6eefcc4bdd63563be8f16946
Component: engine
2015-10-09 20:50:27 -04:00
ddc5f041c8
Merge pull request #16867 from dmcgowan/distribution-upstream-name-change
...
Update distribution package for name regexp change
Upstream-commit: 90e733f0b1ca570657cee2222b0ad1775d096619
Component: engine
2015-10-09 10:09:23 -07:00
505ac314c6
Update distribution package
...
Pick up name regexp change in distribution to allow matching of hostnames as a valid component of a repository.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: b5b0da5fec235df864f5d84292b277aee80e5e3a
Component: engine
2015-10-08 17:16:43 -07:00
