4738f86f62
Merge pull request #18682 from calavera/replace_units_package
...
Replace pkg/units with docker/go-units.
Upstream-commit: b44b5bbc8ba48f50343602a21e7d44c017c1e23d
Component: engine
2015-12-16 10:48:59 -08:00
0e29e152da
Vendor go-units and libcontainer.
...
Libcontainer depends on the new package now to avoid cycled
dependencies.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0609342d04e3e5fbcf17f36c5affef5073643636
Component: engine
2015-12-16 12:25:54 -05:00
d75ce7e929
cleanup hack/.vendor-helpers.sh
...
seccomp is already in $dockerBuildTags
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6636aec38a6cb93cab2924dc94acd5615f4ccab8
Component: engine
2015-12-15 15:50:10 -08:00
17c0082e32
Merge pull request #18648 from jfrazelle/fix-install-script-trusty
...
fix install script for ubuntu trusty
Upstream-commit: b0f652fc3892ed85673c79587807a8b9cb6256a4
Component: engine
2015-12-15 12:55:01 -08:00
26cf52e1eb
Merge pull request #18097 from btorresgil/kali-linux-2.0-installer
...
Add support for installation on Kali Linux 2.0
Upstream-commit: 42ea7a8a93c15e77904e4324b77aa86cc0cab29d
Component: engine
2015-12-15 08:52:53 -08:00
19f8a4f8fb
Merge pull request #18486 from aboch/vnd
...
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Upstream-commit: 260cbb19c93ba1dc5aa0f4065cd5c95241bbd59d
Component: engine
2015-12-14 13:32:01 -08:00
3d2a8bfdec
fix install script for ubuntu trusty
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: bdde4b32a1bd1b2c79ac22464ffb78509046fcb4
Component: engine
2015-12-14 13:13:39 -08:00
4b93eb25be
Merge pull request #18612 from mrunalp/update_runc
...
Update runc/libcontainer to v0.0.6
Upstream-commit: ecc3717cb17313186ee711e624b960b096a9334f
Component: engine
2015-12-14 13:05:53 -08:00
89d947a31f
Merge pull request #18570 from suihkulokki/control-fix
...
hack/make/.build-deb/control: add missing fields
Upstream-commit: 03e2923e42446dbb830c654d0eec323a0b4ef02a
Component: engine
2015-12-14 10:41:56 -08:00
df6285237c
Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen
...
Windows CI Fix: No subshell due to bash 3.x
Upstream-commit: b13fd10109db75996a31fd52393ef3410feee3ca
Component: engine
2015-12-14 10:32:53 -08:00
3c4fcf6b7a
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com >
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
fbb93e6251
Update runc/libcontainer to v0.0.6
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: e8f7d5885dad5364b25a8f1efa8bb6b29afa89b1
Component: engine
2015-12-11 15:24:32 -05:00
db749df51c
Merge pull request #18197 from nalind/workaround-go-libgcc
...
Work around a linking problem on 32-bit arches
Upstream-commit: 2ea48e9fc09ba83785355c5d073e9bfae81ea266
Component: engine
2015-12-10 11:50:03 -05:00
6c4e6c7bea
control: add missing fields
...
Without section/priority, reprepro will reject the packages. Add
sections following the Debian docker.io packages
Signed-off-by: Riku Voipio <riku.voipio@linaro.org >
Upstream-commit: 8d2a423d8716aafc4bd5d05eeceec87dae27202b
Component: engine
2015-12-10 16:57:39 +02:00
fa08b99054
Fix format issue
...
Remove prefix and suffix spaces and tabs.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: bd00905614346f6b9a6289bd1042252f8d99df2e
Component: engine
2015-12-10 15:18:16 +08:00
3bcd3dfc58
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 8fe6b3835c87abf0c48d60f9c1f70bdcb496566c
Component: engine
2015-12-09 13:48:24 -08:00
b5aedd6d20
Windows: No subshell due to bash 3.x
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e078adc93b9ba52d85a21adb61c16c2e25e367c9
Component: engine
2015-12-08 22:24:55 -08:00
6efe38c23e
Merge pull request #18435 from cilium-team/changing-udev-rules-file-permissions
...
Fixed 80-docker.rules file permissions to 644
Upstream-commit: dead67308cf89d055a83ba66fd6a6bdc87e82f14
Component: engine
2015-12-08 16:28:54 -08:00
6140358db6
Fixes for ppc64le and 390x frozen-images
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 03fc212b6d6c2b3ecff42f33b7b3a7181043b09e
Component: engine
2015-12-08 14:26:34 -05:00
ab6c9709f6
Merge pull request #17989 from jfrazelle/initial-seccomp-support
...
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
9fa2e0631e
Fixed 80-docker.rules file permissions to 644
...
Signed-off-by: André Martins <aanm90@gmail.com >
Upstream-commit: 6eef5ab42d31b9aa5287e34f95af05fd584a4f85
Component: engine
2015-12-04 15:31:44 +00:00
448be2245f
Merge pull request #18409 from tonistiigi/fix-sha-prefix-inspect
...
Vendor distribution and fix inspect by sha256 prefix
Upstream-commit: c80d03db77d1bb70f85b3d765221bf7206714344
Component: engine
2015-12-03 20:59:47 -05:00
58deeedf40
update hack/vendor.sh scripts and run vendor
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ed5853de40b5e5c5df070a1f90f1fdde3ac56b20
Component: engine
2015-12-03 16:30:48 -08:00
d286ab94c3
vendor: bump distribution to 568bf038af6d65b376165d02886b1c7fcaef1f61
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 53cd579b6e4617bc13ad0f6e43a74dba9d0a8bb2
Component: engine
2015-12-03 13:36:31 -08:00
ec460c332e
Windows CI Fix: Timeout change
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2097e7fceec5c58352f78e8667000c8b5cb85231
Component: engine
2015-12-03 12:45:56 -08:00
33cb231c55
Fix broken Windows CI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c10311bc9a981f1fdea88ba5f488225eaeea2b69
Component: engine
2015-12-03 10:12:11 -08:00
50eaa45a45
Merge pull request #18375 from vbatts/tar-split_update
...
vendor: update tar-split to v0.9.11
Upstream-commit: 1475f567cbf002aad3db6ed829d9285a70febdb0
Component: engine
2015-12-02 20:25:07 -08:00
15181abee7
Merge pull request #18309 from WeiZhang555/time
...
Consolidate time format for API
Upstream-commit: 6deec021e5bbfd1942cfacb34c6593379e8b8c30
Component: engine
2015-12-02 22:28:28 +01:00
d4bbe1cfa0
vendor: update tar-split to v0.9.11
...
For optimizations.
https://github.com/docker/docker/issues/18370#issuecomment-161399901
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 919104e6bb19b2e815236ee5cffa919c373f85e2
Component: engine
2015-12-02 15:34:12 -05:00
72a4a2701c
Merge pull request #17769 from tianon/vendor-windows
...
Fix Windows support in .vendor-helpers.sh
Upstream-commit: 289251d088959076d0e8a0335a4b028d3453d486
Component: engine
2015-12-02 10:02:08 -08:00
dad4518af4
Use -z,muldefs on arm,x86
...
Assume that the linker can make sense of us passing in the -z,muldefs
option to tell it to ignore symbol-multiply-defined errors triggered by
https://github.com/golang/go/issues/9510 . We should be able to stop
doing this once we move to Go 1.6.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com > (github: nalind)
Upstream-commit: 800505729b280a19fb0c2779b1081b6c4e20d43c
Component: engine
2015-12-02 10:30:13 -05:00
c529eb3ce9
Consolidate time format for API
...
Consolidate all the API to same time format: RFC3339, and it will be
client's responsibility to present it in more user friendly way.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 9daca1222adabf3aeae97a2c4e5f4ed1bb8c15e1
Component: engine
2015-12-02 22:40:18 +08:00
d5614b1f4a
Merge pull request #18315 from jfrazelle/change-frozen-image-v2
...
update download-frozen-image.sh to v2 registry
Upstream-commit: da0c9286a9e82a88e75eb9298e96426978fba4bc
Component: engine
2015-12-01 17:12:00 -05:00
a29b07bf59
update download-frozen-image.sh to v2 registry
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 359d0c247fe523ef82676f9ae4046b79e6854fe1
Component: engine
2015-12-01 13:16:42 -08:00
3bd7baa41a
add licence to rpm
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 09d448f924aabf67ad476ce20539efa78a2715ca
Component: engine
2015-11-30 15:19:31 -08:00
4fd3238892
fix gopath when building debs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 4935f7f500b8473ce53848e0c9673bac7a9fb522
Component: engine
2015-11-30 13:44:59 -08:00
cd510fc600
Golint auto-generated file
...
Fix auto-generation script to golint auto-generated files.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: a7b73e57bc55ff63ccbe3a9ff879a25253292c9b
Component: engine
2015-11-30 16:34:07 +08:00
c93754a0f9
vendor: bump deps
...
bump runc/libcontainer to v0.0.5
bump runc deps to latest
bump docker/libnetwork to 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 65900d7603368f045c904d178fab05a13c44a066
Component: engine
2015-11-26 16:29:59 +01:00
af5191b5dd
hack: make: .go-autogen: add blank line after build tag
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a1733c6575339e254f2b49625d597f46f883fe42
Component: engine
2015-11-26 13:16:39 +01:00
18fcb12c86
install.sh: fix for multiarch deb/ubuntu
...
Currently, the Docker repos will trigger apt-get errors on a
multiarch-configured deb system because the repos don't contain all
architectures. For example, on a multiarch system supporting amd64 and
armhf, apt-get will look for armhf Docker packages, fail to find them,
and error out.
Fix this by qualifying the repo line with the currently active
architecture.
This fixes issue #18207 .
Signed-off-by: Martin Kelly <martin@surround.io >
Upstream-commit: 3e5ac742417dc9461dd090c29ee9971ff0974adb
Component: engine
2015-11-24 16:53:13 -08:00
5c2015e2d5
Merge pull request #17714 from mikedougherty/cs-release-fixes
...
Fixes for release scripts
Upstream-commit: ae1fadeb96c8f64f1eebe2b729c07048398de013
Component: engine
2015-11-23 19:47:10 -08:00
a265b48c9a
Fixes for release scripts:
...
Add a flag to allow keeping bundles around (helps with CI)
Fix several problems in repo make targets
* quote DOCKER_EXPERIMENTAL variable
* pass-through arguments for gpg provided to dpkg-sig are now quoted
properly, so passphrases with shell-interpolated symbols can be used
* when determining deb suites, don't rely on 'origin' to be
github.com/docker/docker
Fix some issues with deb repository creation from scratch
* Don't add empty components to the repository configuration as they
will cause failure when generating.
Add old docker-engine-cs name to package conflicts
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com >
Upstream-commit: a15b67b1affb2eac5365614e55703f43b6f73e9b
Component: engine
2015-11-23 17:15:54 -08:00
e1191bf537
Merge pull request #17459 from brahmaroutu/Power_Z_CI
...
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
Upstream-commit: 249b3a9479048bcec8da0666c2e224dddcfc3de8
Component: engine
2015-11-19 15:50:07 -08:00
cc6e53230d
Fixed an endpoint delete issue with a possible stale sbox
...
Stale sandbox could be a result of stress tests on ungraceful
restarts such as #17984
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 423b55c4b4aaaa55188b3aeca2b6b2005b19e7ea
Component: engine
2015-11-19 12:46:37 -08:00
9ee83ab63e
Add support for installation on Kali Linux 2.0
...
Signed-off-by: Brian Torres-Gil <btorres-gil@paloaltonetworks.com >
Upstream-commit: 9c1ccf708497c1c2009561090b60f150d1b1876b
Component: engine
2015-11-19 11:18:28 -08:00
64fc0f7510
Merge pull request #18023 from LK4D4/goodbye_dind
...
Remove cgroup mounting in dind
Upstream-commit: 7147ac6ce730fee150caeb627b426fb9f45daf80
Component: engine
2015-11-17 15:12:08 -08:00
acf57d6a06
Prevent the creation of "a.out" at the repo root
...
Our clever "gcc" invocations were creating a spurious "a.out" file at the root of the repo (which just happened to be in ".gitignore" so we didn't notice it sooner).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 7f608c391dc62a712cf0d641698ed1cdc38a4e6c
Component: engine
2015-11-17 09:44:36 -08:00
820dd65e7d
Merge pull request #17999 from tianon/linkmode-external
...
Remove "-linkmode external"
Upstream-commit: 71f422435ed0ea645355f1375e2a778822416302
Component: engine
2015-11-17 08:33:32 -08:00
2ed2d47ded
Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm
...
Add initial support for Docker on ARM
Upstream-commit: 1c8d8b301259ae18cfdb56043c000e8353987a3a
Component: engine
2015-11-17 16:52:54 +01:00
a7857ff3b0
Remove cgroups mounting in dind
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 81aa1b507f51901eafcfaad70a656da376cf937d
Component: engine
2015-11-16 17:10:53 -08:00
