Commit graph

1136 commits

Author SHA1 Message Date
Sebastiaan van Stijn
814ce44d5a Don't build Darwin 32-bit binaries
The last 32-bit OS X computers were built in 2006,
so we probably don't need these anymore.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-22 00:08:18 +01:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Alexander Morozov
f8140332c0 Merge pull request #18719 from jfrazelle/vendor-updates
update and run vendor script
2015-12-16 11:27:02 -08:00
David Calavera
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
Jessica Frazelle
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
David Calavera
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
Jessica Frazelle
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
David Calavera
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
Tianon Gravi
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
Alexander Morozov
260cbb19c9 Merge pull request #18486 from aboch/vnd
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
2015-12-14 13:32:01 -08:00
Jessica Frazelle
bdde4b32a1
fix install script for ubuntu trusty
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-14 13:13:39 -08:00
Alexander Morozov
ecc3717cb1 Merge pull request #18612 from mrunalp/update_runc
Update runc/libcontainer to v0.0.6
2015-12-14 13:05:53 -08:00
Jess Frazelle
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
Jess Frazelle
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
Justas Brazauskas
927b334ebf Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
2015-12-13 18:04:12 +02:00
Mrunal Patel
e8f7d5885d Update runc/libcontainer to v0.0.6
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-12-11 15:24:32 -05:00
Phil Estes
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
Riku Voipio
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
Qiang Huang
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
Alessandro Boch
8fe6b3835c Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-12-09 13:48:24 -08:00
John Howard
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
David Calavera
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
Christopher Jones
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
Jess Frazelle
87a614ed55 Merge pull request #17989 from jfrazelle/initial-seccomp-support
Phase 1: Initial seccomp support
2015-12-05 08:33:58 -08:00
André Martins
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
Doug Davis
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
Jessica Frazelle
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
Tonis Tiigi
53cd579b6e vendor: bump distribution to 568bf038af6d65b376165d02886b1c7fcaef1f61
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-03 13:36:31 -08:00
John Howard
2097e7fcee Windows CI Fix: Timeout change
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-03 12:45:56 -08:00
John Howard
c10311bc9a Fix broken Windows CI
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-03 10:12:11 -08:00
Alexander Morozov
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
Sebastiaan van Stijn
6deec021e5 Merge pull request #18309 from WeiZhang555/time
Consolidate time format for API
2015-12-02 22:28:28 +01:00
Vincent Batts
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
Jess Frazelle
289251d088 Merge pull request #17769 from tianon/vendor-windows
Fix Windows support in .vendor-helpers.sh
2015-12-02 10:02:08 -08:00
Nalin Dahyabhai
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
Zhang Wei
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
Phil Estes
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
Jessica Frazelle
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
Jessica Frazelle
09d448f924
add licence to rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 15:19:31 -08:00
Jessica Frazelle
4935f7f500
fix gopath when building debs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 13:44:59 -08:00
Zhang Wei
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
Antonio Murdaca
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
Antonio Murdaca
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
Martin Kelly
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
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
Brian Torres-Gil
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