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
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
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
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
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
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
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
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
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
9d71a73335
Merge pull request #17786 from Microsoft/10662-nativetestunit
...
Windows: Native make test-unit
Upstream-commit: e2a9eede2800144651dd2efe335e4bf386b9fd83
Component: engine
2015-11-08 11:12:09 +01:00
975dc00b97
Windows: Native make test-unit
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7268f767e6d7d1067c896a959654cf493bc5b073
Component: engine
2015-11-07 08:23:10 -08:00
83dc9caccd
Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild
...
Windows: Native build without link errors
Upstream-commit: efc7b9bbf7434aef067ad27cb6ba47f8f14ddf5d
Component: engine
2015-11-07 08:22:35 -08:00
10a453a65f
Windows: Native daemon build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d92f7f42b22e2cfd1ca751824f907357d8143a3d
Component: engine
2015-11-06 15:35:56 -08:00
cddc489efe
Windows: Fix test-unit for local run
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 33faea576ffbd0e86d1f0f53876620f9e4d9b63f
Component: engine
2015-11-06 15:23:48 -08:00
13125ff6b4
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
f427a47755
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
4925d54787
Merge pull request #17496 from chasebolt/centos-rpm-dep
...
setting device-mapper-libs version dependency for centos 7 rpm
Upstream-commit: 31fa27d47ead9d3be08338a748ee9cc21c085183
Component: engine
2015-11-05 13:46:27 -08:00
0e4d37bec5
Merge pull request #17697 from jfrazelle/test-old-apt-repo
...
add script to test the old apt-repo
Upstream-commit: f267e4be54170855693d240e605ff9a4ee8e891d
Component: engine
2015-11-05 12:11:57 +01:00
bedb26558b
add script to test the old apt-repo
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 3f2747943583c06dc3ee1744a5ffa4ce7c099c7c
Component: engine
2015-11-04 16:01:19 -08:00
13774a5b6d
after the changes to unit test framework, fixing gccgo to run unit tests
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 81b3d2eec9d107e7bb6e839ca3506f0bf9dee9db
Component: engine
2015-11-03 17:57:06 +00:00
b9cfc706d4
Add TESTDIRS back
...
Makes it simpler to test only one package.
Was removed by #17491 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4a54ab387f4b11310476414f575fb2502970b65d
Component: engine
2015-11-02 19:44:09 +01:00
873a58e636
expand the list a bit more
...
Signed-off-by: Chase Bolt <chase.bolt@gmail.com >
Upstream-commit: d8aaf962169e2c6070d178bb754b0171b45e2328
Component: engine
2015-10-29 15:23:44 -07:00
9a9584b78d
setting device-mapper-libs version dependency for centos 7 rpm
...
Signed-off-by: Chase Bolt <chase.bolt@gmail.com >
Upstream-commit: 787d94626febc306f5f0340af40c085b9a41f614
Component: engine
2015-10-29 11:11:19 -07:00
691e7791f8
Run unit tests as single command
...
For me it increased speed of unit-tests tremendously, however this disabled
coverage profiles generation, which I think is pretty good tradeoff.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1c23de0e64887f6c36b2156dd65717f723493775
Component: engine
2015-10-29 09:39:51 -07:00
b78e8b7756
docker-py: upgrade and fix test script
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8db141049f5323d754584f265b267e52ee5d9e17
Component: engine
2015-10-28 12:56:50 -04:00
99471f9ab2
update to binaries, fix parsers package, non-parallel test unit
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 9bcbb39fa8b91ceb54c3da7b245e79b56de1cb6b
Component: engine
2015-10-27 14:43:25 -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
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
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
dabf81be3c
Merge pull request #16831 from jfrazelle/release-updates
...
Release updates
Upstream-commit: e3fabf3ea1548afa3d147eb6f41b8656a70569b7
Component: engine
2015-10-16 16:57:10 -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
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
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
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
