Tianon Gravi
ae1fadeb96
Merge pull request #17714 from mikedougherty/cs-release-fixes
...
Fixes for release scripts
2015-11-23 19:47:10 -08:00
Mike Dougherty
a15b67b1af
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>
2015-11-23 17:15:54 -08:00
Michael Crosby
249b3a9479
Merge pull request #17459 from brahmaroutu/Power_Z_CI
...
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
2015-11-19 15:50:07 -08:00
Madhu Venugopal
423b55c4b4
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>
2015-11-19 12:46:37 -08:00
Michael Crosby
7147ac6ce7
Merge pull request #18023 from LK4D4/goodbye_dind
...
Remove cgroup mounting in dind
2015-11-17 15:12:08 -08:00
Tianon Gravi
7f608c391d
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>
2015-11-17 09:44:36 -08:00
Alexander Morozov
71f422435e
Merge pull request #17999 from tianon/linkmode-external
...
Remove "-linkmode external"
2015-11-17 08:33:32 -08:00
Jess Frazelle
1c8d8b3012
Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm
...
Add initial support for Docker on ARM
2015-11-17 16:52:54 +01:00
Alexander Morozov
81aa1b507f
Remove cgroups mounting in dind
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-16 17:10:53 -08:00
Tianon Gravi
927e1e98b7
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>
2015-11-15 14:47:48 -08:00
Govinda Fichtner
b74fd0628a
Add initial support for Docker on ARM
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2015-11-15 13:15:31 +01:00
Tibor Vass
586152523d
Merge pull request #17987 from jfrazelle/correct-ltdl
...
Correct ltdl and fix experimental macro for rpms
2015-11-15 03:46:23 +01:00
Jessica Frazelle
38724c80ab
fix experimental boolean macro
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-14 14:47:13 -08:00
Alexander Morozov
fb77b822ad
Merge pull request #17758 from rhatdan/dynbinary
...
Since default is dynbinary we should test with dynbinary
2015-11-14 10:54:03 -08:00
Arnaud Porterie
7a6f2cdeeb
Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration
...
New version of notary with pkcs11 client integration
2015-11-14 12:03:29 +01:00
Dan Walsh
0d47b74a7f
Since default is dynbinary we should test with dynbinary
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-11-14 06:01:55 -05:00
Antonio Murdaca
dc136b710b
Merge pull request #17211 from endocode/kayrus/docker_fd_https
...
Added possibility to use TLS with systemd socket activation
2015-11-14 08:36:54 +01:00
Srini Brahmaroutu
b1cc78b8f5
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>
2015-11-14 03:16:45 +00:00
Jessica Frazelle
6c818f3e5f
update for mac
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:54 -08:00
Jessica Frazelle
cf4c3da725
update debs/rpms for pkcs11 yubikey things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:53 -08:00
Jessica Frazelle
141369457f
add buildtag pkcs11 to experimental
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:49 -08:00
Jessica Frazelle
94ea6af8cd
update vendor.sh and notary api for vendored changes
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:19:11 -08:00
kayrus
0f2b3191d9
Added possibility to use TLS with systemd socket activation
...
Signed-off-by: kayrus <kay.diam@gmail.com>
2015-11-13 17:01:23 +01:00
Tianon Gravi
8b9856dbd7
Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
...
update release script and release process
2015-11-12 09:51:36 -08:00
David Calavera
eed704f7d9
Merge pull request #17901 from runcom/remove-not-needed-func
...
hack: make.sh: remove not used function
2015-11-12 07:16:43 -08:00
Antonio Murdaca
dc41fff56e
hack: make.sh: remove not used function
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-11 10:19:03 +01:00
Alessandro Boch
43b3b6ecb4
Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-10 21:13:25 -08:00
Tibor Vass
09980ef7ac
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
2015-11-10 23:38:33 -05:00
Paolo G. Giarrusso
c5f24c7902
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>
2015-11-10 18:06:58 +01:00
Alessandro Boch
9c395537bc
Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae
...
- To bring in ip-range fix
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-09 15:29:54 -08:00
David Calavera
58b270c338
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
2015-11-09 13:15:50 -08:00
Vincent Demeester
e509fe604c
Merge pull request #17816 from coolljt0725/remove_execdriver_env
...
Remove DOCKER_EXECDRIVER env
2015-11-09 19:59:18 +01:00
Vincent Demeester
8054a30387
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>
2015-11-09 19:32:46 +01:00
Alexander Morozov
00bcc924fa
Update runc to introduce RelabelNeeded function
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-09 10:03:25 -08:00
Lei Jitang
3c4dab51d3
Remove DOCKER_EXECDRIVER env
...
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.
Signed-off-by: Lei Jitang <leijiang@huawei.com>
2015-11-09 09:17:32 +08:00
Jess Frazelle
ea59233eb1
Merge pull request #16533 from justsml/LMDEv2
...
LMDE check added to `check_forked()` function - See #16498
2015-11-08 02:28:11 -08:00
Vincent Demeester
e2a9eede28
Merge pull request #17786 from Microsoft/10662-nativetestunit
...
Windows: Native make test-unit
2015-11-08 11:12:09 +01:00
John Howard
7268f767e6
Windows: Native make test-unit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-07 08:23:10 -08:00
David Calavera
efc7b9bbf7
Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild
...
Windows: Native build without link errors
2015-11-07 08:22:35 -08:00
John Howard
d92f7f42b2
Windows: Native daemon build
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:35:56 -08:00
John Howard
33faea576f
Windows: Fix test-unit for local run
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:23:48 -08:00
Solomon Hykes
2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
David Calavera
98ec6bc14c
Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic
...
Fix panic in parsing /etc/os-release
2015-11-05 15:11:02 -08:00
David Calavera
157b66ad39
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:58 -05:00
David Calavera
3b5fac462d
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:57 -05:00
Jess Frazelle
31fa27d47e
Merge pull request #17496 from chasebolt/centos-rpm-dep
...
setting device-mapper-libs version dependency for centos 7 rpm
2015-11-05 13:46:27 -08:00
Vincent Demeester
b09a452c1f
Vendor mattn/go-shellwords
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-05 19:59:28 +01:00
Vincent Demeester
f267e4be54
Merge pull request #17697 from jfrazelle/test-old-apt-repo
...
add script to test the old apt-repo
2015-11-05 12:11:57 +01:00
Jessica Frazelle
d0a4b216a6
update release script and release process
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-04 16:20:04 -08:00
Jessica Frazelle
3f27479435
add script to test the old apt-repo
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-04 16:01:19 -08:00