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
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
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
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
19bcd2fd89
Remove "-linkmode external"
...
We're having to override it in so many places that it no longer seems worthwhile to bother. On top of that, the reason we did it in the first place was for being able to compile devicemapper statically, which still works after this change (either due to other changes in the way we build, or improvements in Go itself).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 927e1e98b7d37bf0593651d4b639e19277e775ca
Component: engine
2015-11-15 14:47:48 -08:00
4c0e9a7066
Add initial support for Docker on ARM
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com >
Upstream-commit: b74fd0628aefbca3b77ffa5d52995c7af2f38d04
Component: engine
2015-11-15 13:15:31 +01:00
7756f05e05
Merge pull request #17987 from jfrazelle/correct-ltdl
...
Correct ltdl and fix experimental macro for rpms
Upstream-commit: 586152523d3c10624156eee485d54de80eeb7fc7
Component: engine
2015-11-15 03:46:23 +01:00
b843dca39f
fix experimental boolean macro
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 38724c80ab32d5d578029f19a1b443341ff3aaf4
Component: engine
2015-11-14 14:47:13 -08:00
42d5166bfc
Merge pull request #17758 from rhatdan/dynbinary
...
Since default is dynbinary we should test with dynbinary
Upstream-commit: fb77b822ad2bb5d097ebd19a6ad4825b967a52ab
Component: engine
2015-11-14 10:54:03 -08:00
2b045a190b
Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration
...
New version of notary with pkcs11 client integration
Upstream-commit: 7a6f2cdeeb88f340649a459697f79548759767dd
Component: engine
2015-11-14 12:03:29 +01:00
dd78f03b3f
Since default is dynbinary we should test with dynbinary
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: 0d47b74a7f3f42640d0714b651417415461b1b8c
Component: engine
2015-11-14 06:01:55 -05:00
0179308537
Merge pull request #17211 from endocode/kayrus/docker_fd_https
...
Added possibility to use TLS with systemd socket activation
Upstream-commit: dc136b710b70a51510726576761f7bf9aa2455e2
Component: engine
2015-11-14 08:36:54 +01:00
cf05bcf15c
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z.
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: b1cc78b8f5d0c85c80c04a15fa791025ae7d22e6
Component: engine
2015-11-14 03:16:45 +00:00
2672323db9
update for mac
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6c818f3e5f1bb4966c8fb54aa0c412360c9094fe
Component: engine
2015-11-13 13:20:54 -08:00
08e6893ada
update debs/rpms for pkcs11 yubikey things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: cf4c3da725e5c923b637a0dbea3d20064286f008
Component: engine
2015-11-13 13:20:53 -08:00
c3491d2f3b
add buildtag pkcs11 to experimental
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 141369457ffaeee79154f4b649525f5c8b3d5f2e
Component: engine
2015-11-13 13:20:49 -08:00
d684c37400
update vendor.sh and notary api for vendored changes
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 94ea6af8cd1cd1d4106579ecf972a74f144e43c8
Component: engine
2015-11-13 13:19:11 -08:00
cf625298ac
Added possibility to use TLS with systemd socket activation
...
Signed-off-by: kayrus <kay.diam@gmail.com >
Upstream-commit: 0f2b3191d9e4f48b1915e2da4acc4f28b0d71494
Component: engine
2015-11-13 17:01:23 +01:00
d41faf6fe1
Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
...
update release script and release process
Upstream-commit: 8b9856dbd7a1981aaa76fcf0fc10b37d1141c9af
Component: engine
2015-11-12 09:51:36 -08:00
374d554d86
Merge pull request #17901 from runcom/remove-not-needed-func
...
hack: make.sh: remove not used function
Upstream-commit: eed704f7d933364e68cf29bcd4ed0e3591fd4b6b
Component: engine
2015-11-12 07:16:43 -08:00
7fb35a1e4a
hack: make.sh: remove not used function
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: dc41fff56eb85552c38716533b2cd982d6e02f40
Component: engine
2015-11-11 10:19:03 +01:00
789bc1f38f
Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 43b3b6ecb4f838023478c484d32957386b7dd666
Component: engine
2015-11-10 21:13:25 -08:00
320a0d9081
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
Upstream-commit: 09980ef7ac2510cc67e160657f0829a47f5b5b28
Component: engine
2015-11-10 23:38:33 -05:00
542df63133
Fix link to installation instructions
...
Fix #17872 :
> The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/ , which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/ .
Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com >
Upstream-commit: c5f24c7902df5a48258056e799952200f250c5f2
Component: engine
2015-11-10 18:06:58 +01:00
62ba8c349b
Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae
...
- To bring in ip-range fix
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 9c395537bce1e787ae34d90b2de81df3a47c5ff9
Component: engine
2015-11-09 15:29:54 -08:00
2f262fa249
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
Upstream-commit: 58b270c338e831ac6668a29788c72d202f9fc251
Component: engine
2015-11-09 13:15:50 -08:00
094e7a47db
Merge pull request #17816 from coolljt0725/remove_execdriver_env
...
Remove DOCKER_EXECDRIVER env
Upstream-commit: e509fe604c51cffb480098c4377c60bea1261fb1
Component: engine
2015-11-09 19:59:18 +01:00
48001c30bb
dockerversion placeholder for library import
...
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8054a303870b81eebe05e38261c1b68197b68558
Component: engine
2015-11-09 19:32:46 +01:00
