325b1f35ae
Remove Ubuntu 15.04 (Vivid) from DEB build as it will be EOL
...
Ubuntu 15.04 (Vivid) will be EOL'd in January,
so we should remove it from our builds in the
Docker 1.10 release.
For information about the EOL data, see:
https://wiki.ubuntu.com/Releases
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-20 16:00:53 +01:00
a08c955e30
Remove Fedora 21 from RPM build as it is EOL
...
Fedora 21 is EOL'd as of December 1st, 2015.
Announcement:
https://lists.fedoraproject.org/pipermail/announce/2015-November/003296.html
Fedora 21 will reach end of life on 2015-12-01, and no further updates
will be pushed out after that time. Additionally, with the recent
release of Fedora 23, no new packages will be added to the Fedora 21
collection.
Please see https://fedoraproject.org/wiki/DNF_system_upgrade for more
information on upgrading from Fedora 21 to a newer release.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-20 00:42:17 +01:00
94fb7458ea
Move DOCKER_ENGINE_ envs to integration-daemon-setup to allow build w/o Makefile
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2015-12-17 18:55:45 +01:00
43ee564326
update Dockerfile to reflect latest changes
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2015-12-17 18:54:00 +01:00
f8140332c0
Merge pull request #18719 from jfrazelle/vendor-updates
...
update and run vendor script
2015-12-16 11:27:02 -08:00
b44b5bbc8b
Merge pull request #18682 from calavera/replace_units_package
...
Replace pkg/units with docker/go-units.
2015-12-16 10:48:59 -08:00
a016ec6fd1
update and run vendor script
...
so there was weird whitespacing that got messed up the last time this was run, this fixes that and cleans up vendor helpers as well :)
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-16 09:58:20 -08:00
0609342d04
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>
2015-12-16 12:25:54 -05:00
6636aec38a
cleanup hack/.vendor-helpers.sh
...
seccomp is already in $dockerBuildTags
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-15 15:50:10 -08:00
b0f652fc38
Merge pull request #18648 from jfrazelle/fix-install-script-trusty
...
fix install script for ubuntu trusty
2015-12-15 12:55:01 -08:00
42ea7a8a93
Merge pull request #18097 from btorresgil/kali-linux-2.0-installer
...
Add support for installation on Kali Linux 2.0
2015-12-15 08:52:53 -08:00
260cbb19c9
Merge pull request #18486 from aboch/vnd
...
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
2015-12-14 13:32:01 -08:00
bdde4b32a1
fix install script for ubuntu trusty
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-14 13:13:39 -08:00
ecc3717cb1
Merge pull request #18612 from mrunalp/update_runc
...
Update runc/libcontainer to v0.0.6
2015-12-14 13:05:53 -08:00
03e2923e42
Merge pull request #18570 from suihkulokki/control-fix
...
hack/make/.build-deb/control: add missing fields
2015-12-14 10:41:56 -08:00
b13fd10109
Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen
...
Windows CI Fix: No subshell due to bash 3.x
2015-12-14 10:32:53 -08:00
927b334ebf
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
2015-12-13 18:04:12 +02:00
e8f7d5885d
Update runc/libcontainer to v0.0.6
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-12-11 15:24:32 -05:00
2ea48e9fc0
Merge pull request #18197 from nalind/workaround-go-libgcc
...
Work around a linking problem on 32-bit arches
2015-12-10 11:50:03 -05:00
8d2a423d87
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>
2015-12-10 16:57:39 +02:00
bd00905614
Fix format issue
...
Remove prefix and suffix spaces and tabs.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-10 15:18:16 +08:00
8fe6b3835c
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-12-09 13:48:24 -08:00
e078adc93b
Windows: No subshell due to bash 3.x
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-08 22:24:55 -08:00
dead67308c
Merge pull request #18435 from cilium-team/changing-udev-rules-file-permissions
...
Fixed 80-docker.rules file permissions to 644
2015-12-08 16:28:54 -08:00
03fc212b6d
Fixes for ppc64le and 390x frozen-images
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-12-08 14:26:34 -05:00
87a614ed55
Merge pull request #17989 from jfrazelle/initial-seccomp-support
...
Phase 1: Initial seccomp support
2015-12-05 08:33:58 -08:00
6eef5ab42d
Fixed 80-docker.rules file permissions to 644
...
Signed-off-by: André Martins <aanm90@gmail.com>
2015-12-04 15:31:44 +00:00
c80d03db77
Merge pull request #18409 from tonistiigi/fix-sha-prefix-inspect
...
Vendor distribution and fix inspect by sha256 prefix
2015-12-03 20:59:47 -05:00
ed5853de40
update hack/vendor.sh scripts and run vendor
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:48 -08:00
53cd579b6e
vendor: bump distribution to 568bf038af
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-03 13:36:31 -08:00
2097e7fcee
Windows CI Fix: Timeout change
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-03 12:45:56 -08:00
c10311bc9a
Fix broken Windows CI
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-03 10:12:11 -08:00
1475f567cb
Merge pull request #18375 from vbatts/tar-split_update
...
vendor: update tar-split to v0.9.11
2015-12-02 20:25:07 -08:00
6deec021e5
Merge pull request #18309 from WeiZhang555/time
...
Consolidate time format for API
2015-12-02 22:28:28 +01:00
919104e6bb
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>
2015-12-02 15:34:12 -05:00
289251d088
Merge pull request #17769 from tianon/vendor-windows
...
Fix Windows support in .vendor-helpers.sh
2015-12-02 10:02:08 -08:00
800505729b
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)
2015-12-02 10:30:13 -05:00
9daca1222a
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>
2015-12-02 22:40:18 +08:00
da0c9286a9
Merge pull request #18315 from jfrazelle/change-frozen-image-v2
...
update download-frozen-image.sh to v2 registry
2015-12-01 17:12:00 -05:00
359d0c247f
update download-frozen-image.sh to v2 registry
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-01 13:16:42 -08:00
09d448f924
add licence to rpm
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 15:19:31 -08:00
4935f7f500
fix gopath when building debs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 13:44:59 -08:00
a7b73e57bc
Golint auto-generated file
...
Fix auto-generation script to golint auto-generated files.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-30 16:34:07 +08:00
65900d7603
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>
2015-11-26 16:29:59 +01:00
a1733c6575
hack: make: .go-autogen: add blank line after build tag
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-26 13:16:39 +01:00
3e5ac74241
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>
2015-11-24 16:53:13 -08:00
ae1fadeb96
Merge pull request #17714 from mikedougherty/cs-release-fixes
...
Fixes for release scripts
2015-11-23 19:47:10 -08:00
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
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
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
9c1ccf7084
Add support for installation on Kali Linux 2.0
...
Signed-off-by: Brian Torres-Gil <btorres-gil@paloaltonetworks.com>
2015-11-19 11:18:28 -08:00
7147ac6ce7
Merge pull request #18023 from LK4D4/goodbye_dind
...
Remove cgroup mounting in dind
2015-11-17 15:12:08 -08:00
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
71f422435e
Merge pull request #17999 from tianon/linkmode-external
...
Remove "-linkmode external"
2015-11-17 08:33:32 -08:00
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
81aa1b507f
Remove cgroups mounting in dind
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-16 17:10:53 -08:00
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
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
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
38724c80ab
fix experimental boolean macro
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-14 14:47:13 -08:00
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
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
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
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
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
6c818f3e5f
update for mac
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:54 -08:00
cf4c3da725
update debs/rpms for pkcs11 yubikey things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:53 -08:00
141369457f
add buildtag pkcs11 to experimental
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:49 -08:00
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
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
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
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
dc41fff56e
hack: make.sh: remove not used function
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-11 10:19:03 +01:00
43b3b6ecb4
Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-10 21:13:25 -08:00
09980ef7ac
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
2015-11-10 23:38:33 -05:00
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
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
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
e509fe604c
Merge pull request #17816 from coolljt0725/remove_execdriver_env
...
Remove DOCKER_EXECDRIVER env
2015-11-09 19:59:18 +01:00
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
00bcc924fa
Update runc to introduce RelabelNeeded function
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-09 10:03:25 -08:00
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
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
e2a9eede28
Merge pull request #17786 from Microsoft/10662-nativetestunit
...
Windows: Native make test-unit
2015-11-08 11:12:09 +01:00
7268f767e6
Windows: Native make test-unit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-07 08:23:10 -08:00
efc7b9bbf7
Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild
...
Windows: Native build without link errors
2015-11-07 08:22:35 -08:00
d92f7f42b2
Windows: Native daemon build
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:35:56 -08:00
33faea576f
Windows: Fix test-unit for local run
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:23:48 -08:00
1c383af6ae
Fix Windows support in .vendor-helpers.sh
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-11-06 12:07:24 -08:00
2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
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
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
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
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
b09a452c1f
Vendor mattn/go-shellwords
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-05 19:59:28 +01:00
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
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
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
b2f14f9bec
Merge pull request #17639 from mrjana/restart
...
Fix a corner case issue when daemon panics
2015-11-04 13:37:45 -08:00
81b3d2eec9
after the changes to unit test framework, fixing gccgo to run unit tests
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-11-03 17:57:06 +00:00
Sebastiaan van Stijn
Stefan Scherer
Govinda Fichtner
Alexander Morozov
David Calavera
Jessica Frazelle
Tianon Gravi
Jess Frazelle
Justas Brazauskas
Mrunal Patel
Phil Estes
Riku Voipio
Qiang Huang
Alessandro Boch
John Howard
Christopher Jones
André Martins
Doug Davis
Tonis Tiigi
Sebastiaan van Stijn
Vincent Batts
Nalin Dahyabhai
Zhang Wei
Antonio Murdaca
Martin Kelly
Mike Dougherty
Michael Crosby
Madhu Venugopal
Brian Torres-Gil
Alexander Morozov
Tibor Vass
Arnaud Porterie
Dan Walsh
Antonio Murdaca
Srini Brahmaroutu
kayrus
Paolo G. Giarrusso
Vincent Demeester
Vincent Demeester
Lei Jitang
Solomon Hykes
Jessica Frazelle