beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22382 commits 14 branches 412 tags 338 MiB
Commit graph

1335 commits

Author SHA1 Message Date
Arnaud Porterie
f11b6a2ab3 Merge pull request #18785 from aaronlehmann/new-manifest 
New image manifest format
 2016-01-11 12:01:46 -08:00
John Howard
a4b77dc1af Windows CI: Setup for testing against Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-11 11:52:03 -08:00
Tibor Vass
2d5ca742eb Merge pull request #19076 from tianon/multiarch 
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
 2016-01-11 13:25:55 -05:00
Arnaud Porterie
ad2966a315 Merge pull request #19138 from Microsoft/jjh/failedtodockerversion 
Windows CI: More debugging
 2016-01-10 18:11:19 -08:00
Arnaud Porterie
fe3d1f9dd7 Merge pull request #19198 from sanimej/vin 
Vendoring libnetwork
 2016-01-10 11:46:34 -08:00
Aaron Lehmann
290ba41c00 Vendor updated github.com/docker/distribution 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-08 17:24:20 -08:00
cyli
5719b136de Re-vendoring notary in order to deal with a canonical JSON serialization issue. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-01-08 16:45:15 -08:00
Santhosh Manohar
8ccf5cffa7 Vendoring libnetwork and its dependencies.. 
- replace /etc/hosts based name resolution with embedded DNS for user
  defined networks
- overlay veth cleanup: docker/docker#18814
- check before programming ipv6 in bridge: docker/docker#19139
- diable DAD: docker/docker#18871

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-08 14:13:21 -08:00
Tianon Gravi
335764a591 Merge pull request #19181 from coolljt0725/enable_build_syscall_test 
Make .ensure-syscall-test to use build-arg
 2016-01-08 13:43:38 -08:00
Phil Estes
557c7cb888 Move userns support out of experimental into master 
Adds the `--userns-remap` flag to the master build

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2016-01-08 15:06:22 -05:00
Arnaud Porterie
05de2aadff Merge pull request #19001 from aboch/pip 
Allow user to choose the IP address for the container
 2016-01-08 11:49:20 -08:00
Jess Frazelle
1c979f7587 Merge pull request #18887 from riyazdf/notary-delegations 
notary delegation integration into docker
 2016-01-08 10:37:55 -08:00
David Calavera
145f020122 Vendor new syslog library with TLS support. 
The syslog package in the stdlib is not maintained anymore.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-08 12:35:35 -05:00
Alessandro Boch
19b063e740 Vendoring libnetwork 
- 49c24217054e269aad3dbfd81ee32780b104dd84

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-08 09:19:31 -08:00
Riyaz Faizullabhoy
1c32a66877 update tests and error messages, revendor notary with tag 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-01-08 09:11:33 -08:00
Lei Jitang
3ff6725613 Make .ensure-syscall-test to use build-arg 
.ensure-syscall-test need to build an image, we have
to add http_proxy and https_proxy to make it work.
Inseted of adding http_proxy and https_proxy env to the Dockerfile,
adding a DOCKER_BUILD_ARGS env to pass the build-arg is much more
elegant.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-08 15:27:21 +08:00
Riyaz Faizullabhoy
1c125f50cf Notary delegation integration into docker 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-01-07 19:35:45 -08:00
David Calavera
1feeecf6e5 Vendor engine-api 0.1.3. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-07 21:02:19 -05:00
Avi Miller
c64f9407a4 Add missing ? to specfile variable. 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2016-01-08 11:06:21 +11:00
Jess Frazelle
d76640d78a Merge pull request #19145 from vdemeester/vendor-my-precious 
Add a validate-vendor script
 2016-01-07 13:53:01 -08:00
Avi Miller
28f52bd06a Restoring the RPM build process for Oracle Linux 6 and updating the docker-engine.spec 
file to require the Unbreakable Enterprise Kernel Release 4 on both Oracle Linux 6
and Oracle Linux 7.

The UEK R4 provides the required kernel functionality for VxLAN support
required by Docker 1.9 and user namespace support required for 1.10+.

The build of Docker on Oracle Linux 6 requires some manipulation of the build
environment so that the CGO compiler uses the UEK R4 headers instead of the old
default kernel headers.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2016-01-08 08:09:47 +11:00
Vincent Demeester
4c22c566e2 Add a validate-vendor script 
Makes sure that if ./hack/vendor.sh has been updated, it has been used
to update the vendor folder.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-07 19:57:50 +01:00
Tibor Vass
131e2bf12b Merge pull request #19068 from calavera/vendor_engine_api 
Introduce the new engine-api library.
 2016-01-07 11:14:37 -05:00
moxiegirl
dd2981c26d Merge pull request #19127 from thaJeztah/use-the-f-luke 
Add -f flag to cURL install instructions
 2016-01-06 20:02:53 -08:00
David Calavera
9927e712c0 Vendor engine-api project. 
Use latest tag for both, engine-api and go-connections.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-06 19:46:06 -05:00
David Calavera
4ee3048fa8 Merge pull request #19110 from brahmaroutu/update_openc 
update runc to the latest code base to fix gccgo builds
 2016-01-06 15:09:11 -08:00
Tianon Gravi
91201678c6 Refactor multi-arch support (especially for new mostly-official multi-arch official images) 
See 99433d2ca2/README.md (architectures-other-than-amd64) for some context of where these images come from.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-01-06 14:34:29 -08:00
John Howard
676118670d Windows CI: More debugging 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-06 11:44:07 -08:00
Sebastiaan van Stijn
9cf29be0ee Add -f flag to cURL install instructions 
From the -f description:

(HTTP) Fail silently (no output at all) on server errors. This is mostly done
to better enable scripts etc to better deal with failed attempts. In normal
cases when an HTTP server fails to deliver a document, it returns an HTML
document stating so (which often also describes why and more). This flag will
prevent curl from outputting that and return error 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-01-06 16:05:16 +01:00
Srini Brahmaroutu
9982631707 update runc to the latest code base to fix gccgo build 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2016-01-06 00:02:56 +00:00
John Howard
a3858873fa Windows CI: No integration daemon stop 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-05 10:52:59 -08:00
Vincent Demeester
0736598b93 Remove hello-world:latest tag before integration 
This is to make sure we are in the same state on linux/arm, linux/… and
other architecture.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-05 14:40:27 +01:00
Jess Frazelle
78873dd6e5 Merge pull request #18461 from Microsoft/jjh/checkin-jenkins-script 
Adding Jenkins CI script to sources
 2016-01-04 15:59:03 -08:00
John Howard
8213f8caaa Adding Jenkins CI script to sources 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-04 15:53:30 -08:00
Jessica Frazelle
327421d1df
add more seccomp profile tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-30 17:30:44 -08:00
Jessica Frazelle
626c933730
cleanup jess/unshare image 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-30 16:20:05 -08:00
Arnaud Porterie
3858027e27 Merge pull request #18933 from coolljt0725/always_build 
Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm
 2015-12-29 11:53:06 -08:00
Tianon Gravi
31bd242cba Merge pull request #18728 from hypriot/update-dockerfile-for-arm 
update Dockerfile.arm to reflect latest changes in main Dockerfile
 2015-12-29 09:24:29 -08:00
Lei Jitang
82051ab996 Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-12-29 04:09:44 -05:00
Jessica Frazelle
15674c5fb7
add docs and unconfined to run a container without the default seccomp profile 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-28 10:26:51 -08:00
Jessica Frazelle
a48fe62384
add default seccomp profile tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-12-28 10:26:48 -08:00
Sebastiaan van Stijn
d4270c1764 Merge pull request #18775 from mrjana/mh 
libnetwork vendoring
 2015-12-26 11:42:55 +01:00
Arnaud Porterie
3e298c5928 Rename -dirty to -unsupported 
Nightly and unofficial builds of Docker bear the suffix `-dirty` in the
version string. Change this suffix to `-unsupported` to make it explicit
that no support will be provided on such versions, and that it is for
example unnecessary to file an issue for it.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-12-24 09:11:49 -08:00
Daniel Nephin
3b8301b660 Upgrade go-units vendor to latest version with ulimits. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-23 13:27:58 -05:00
Daniel Nephin
fcc24995e0 Upgrade vendored github.com/docker/go-connections to latest version, which includes new nat parse functions. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-22 18:59:47 -05:00
Jana Radhakrishnan
f0904affd1 libnetwork vendoring 
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436

Brings in:
    * Support for overlay network driver in 3.10+ kernels
    * Freebsd compilation fixes
    * Remove .dockerinit dependency
    * IPAM driver capability support
    * Network internal mode support
    * Misc. fixes

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-12-22 13:32:17 -08:00
David Calavera
ad7fa01102 Vendor new connections library. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-12-22 13:31:46 -05:00
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
Stefan Scherer
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
Govinda Fichtner
43ee564326 update Dockerfile to reflect latest changes 
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
 2015-12-17 18:54:00 +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
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
Tianon Gravi
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
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
Alexander Morozov
b2f14f9bec Merge pull request #17639 from mrjana/restart 
Fix a corner case issue when daemon panics
 2015-11-04 13:37:45 -08:00
Srini Brahmaroutu
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
kayrus
0a6acbede3 Updated vendor go-systemd with enabled TLS activation 
Signed-off-by: kayrus <kay.diam@gmail.com>
 2015-11-03 11:02:05 +01:00
Jana Radhakrishnan
79cffa5ce4 Fix a corner case issue when daemon panics 
There is an extreme corner case where when the daemon
panics at the same time as a container is stopping
and cleaning up the sandbox and the sandbox may have been
left with an inconsistent state. This libnetwork vendoring
fixes that case.

Vendoring in libnetwork @ 5305ea570b85d61dd0fd261cd7e1680da1884678

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-11-02 18:37:35 -08:00
Derek McGowan
6964f42350 Merge pull request #17557 from aaronlehmann/update-distribution 
Vendor updated version of docker/distribution
 2015-11-02 14:37:04 -08:00
Aaron Lehmann
257c59251b Vendor updated version of docker/distribution 
This updates the vendored docker/distribution to the current master
branch.

Note the following changes:

- The manifest package was split into manifest/schema1. Most references
  to the manifest package in the engine needed to be updated to use
  schema1 instead.

- Validation functions in api/v2 were replaced by the
  distribution/reference package. The engine code has been updated to
  use the reference package for validation where necessary. A future PR
  will change the engine to use the types defined in
  distribution/reference more comprehensively.

- The reference package explicitly allows double _ characters in
  repository names. registry_test.go was updated for this.

- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
  that the schema1 package unmarshals the correct payload. The test is
  being changed to modify the JSON without affecting its length, which
  allows the pull to succeed to the point where digest validation
  happens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-11-02 12:40:18 -08:00
David Calavera
b95048758a Merge pull request #17619 from jfrazelle/canonical-update 
rebased canonical/json off go 1.5.1
 2015-11-02 11:42:26 -08:00
David Calavera
f962c0715f Merge pull request #17620 from vdemeester/unit-test-TESTDIRS 
Bring TESTDIRS back for unit-tests
 2015-11-02 11:41:19 -08:00
Vincent Demeester
4a54ab387f Add TESTDIRS back 
Makes it simpler to test only one package.
Was removed by #17491.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 19:44:09 +01:00
Jessica Frazelle
0d881349e8
rebased canonical/json off go 1.5.1 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-02 10:23:02 -08:00
Jana Radhakrishnan
10e1b9f02e Vendoring libnetwork 
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-11-02 08:33:52 -08:00
Madhu Venugopal
2361edbcea Vendoring in libnetwork to fix an ungraceful restart case 
Also picked up a minor typo fix

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-30 16:24:02 -07:00
Brian Goff
17a8fbeaeb Merge pull request #17514 from mavenugo/ugr 
Fixing a case of dangling endpoint during ungraceful daemon restart
 2015-10-30 13:38:27 -04:00
Tibor Vass
c545dce004 Merge pull request #16640 from samuelkarp/awslogs-logging-driver 
[awslogs] Auto-detect region and set user-agent
 2015-10-30 12:38:40 -04:00
Madhu Venugopal
ebf76171f6 Vendoring libnetwork to solve an ungraceful restart condition 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-29 18:56:17 -07:00
Jess Frazelle
d30caedbf8 Merge pull request #17491 from LK4D4/seq_tests 
Run unit tests as single command
 2015-10-29 16:29:24 -07:00
Chase Bolt
d8aaf96216 expand the list a bit more 
Signed-off-by: Chase Bolt <chase.bolt@gmail.com>
 2015-10-29 15:23:44 -07:00
Alexander Morozov
7f7950aa18 Merge pull request #17490 from aboch/pm 
Libnetwork vendoring & overlay networking fixes
 2015-10-29 13:45:19 -07:00
Chase Bolt
787d94626f setting device-mapper-libs version dependency for centos 7 rpm 
Signed-off-by: Chase Bolt <chase.bolt@gmail.com>
 2015-10-29 11:11:19 -07:00
Alexander Morozov
1c23de0e64 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>
 2015-10-29 09:39:51 -07:00
Alessandro Boch
90744fe943 Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-29 09:24:48 -07:00
Doug Davis
b6e1f4dd69 Merge pull request #16898 from hqhq/hq_bump_bolt 
Bump bolt to v1.1.0
 2015-10-28 18:51:23 -04:00
Tibor Vass
8db141049f docker-py: upgrade and fix test script 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-10-28 12:56:50 -04:00
Jess Frazelle
96a6e810de Merge pull request #17418 from diogomonica/bump-go-1.5 
Bump go 1.5
 2015-10-27 20:12:43 -07:00
Brian Goff
b78ca243d9 Revert "dockerversion placeholder for library-import" 
This reverts commit d5cd032a86.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-27 21:23:53 -04:00
Qiang Huang
a41917c2c8 Bump bolt to v1.1.0 
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-10-28 08:49:45 +08:00
Samuel Karp
70083e6fc3 Update vendored aws-sdk-go 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2015-10-27 23:43:51 +00:00
Jessica Frazelle
9bcbb39fa8
update to binaries, fix parsers package, non-parallel test unit 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-27 14:43:25 -07:00
David Calavera
6276c676a8 Merge pull request #17350 from vdemeester/11699-auto-libraryimport 
dockerversion placeholder for library-import
 2015-10-27 13:39:40 -07:00
Vincent Demeester
d5cd032a86 dockerversion placeholder for library-import 
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-27 20:36:07 +01:00
David Calavera
91de5ddf18 Merge pull request #17381 from mavenugo/rc3v1 
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
 2015-10-26 17:06:01 -07:00
David Calavera
fe1e04a84f Merge pull request #17285 from Microsoft/10662-exectp4workaround 
Windows [TP4] Trap Hyper-V exec failure
 2015-10-26 16:47:51 -07:00
Sebastiaan van Stijn
9312a738d8 Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install 
apparmor check version on deb install
 2015-10-26 22:44:11 +01:00
Madhu Venugopal
139d1e13e2 Vendoring in libnetwork with fixes for issues identified in RC1 & RC2 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-26 13:56:56 -07:00
Santhosh Manohar
1041f39670 Vendor in libnetwork changes to support container rename 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2015-10-23 16:27:03 -07:00
John Howard
a3c43964cf Windows [TP4] HCSShim Revendor 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-23 08:41:30 -07:00
Madhu Venugopal
793b20ba09 Vendoring in libkv to be aligned with libnetwork 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-22 14:12:46 -07:00
Madhu Venugopal
52df87ac2b Vendoring in Libnetwork 
This carries fixes for
- Internal racy /etc/hosts updates within container during SD
- Renable SD service record watch after cluster-store restarts
- Fix to allow remote IPAM driver to return no IP if the user prefers
- Fix to allow --fixed-cidr and --bip to be in same range

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-22 14:12:46 -07:00
David Calavera
2afdc6582b Merge pull request #17274 from aboch/ai 
Turn off discovery when icc == false
 2015-10-22 13:08:31 -07:00
Jess Frazelle
af6743a6c6 Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest 
RPM change install location of Fish completions
 2015-10-21 14:36:50 -07:00
Jess Frazelle
08fb495975 Merge pull request #17145 from thaJeztah/deb-add-fish-completions 
deb: add fish completions
 2015-10-21 13:58:22 -07:00
Tibor Vass
420e07cc2c release: fix bash bug in script 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-10-21 16:02:14 -04:00
Alessandro Boch
1be540b99b Vendoring in libnetwork for the anonymous endpoint 
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-21 09:32:48 -07:00
Tibor Vass
bb5551746b Merge pull request #17229 from mavenugo/ds_fix 
Fixing bootup inconsistencies due to invalid cluster-store config
 2015-10-21 12:00:07 -04:00
Madhu Venugopal
2de2192c27 Vendoring in libnetwork to fix daemon bootup instabilities 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-20 19:56:59 -07:00
David Lawrence
43ba8a0426 some bugfixes on getting tuf files, this is backed by a lot of new unit tests in gotuf 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-10-20 13:22:06 -07:00
David Calavera
a7868191d4 Merge pull request #17188 from jfrazelle/fix-release-rpm 
fix copy of multiple rpms
 2015-10-20 11:31:35 -07:00
Jana Radhakrishnan
9750dd0088 Vendoring libnetwork 
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052

Has bug fixes for 1.9

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-10-19 21:29:26 -07:00
Jessica Frazelle
14e85c8c55
add test script for built debs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:15:27 -07:00
Jessica Frazelle
8369f00d30
add generate aa profile to deb install 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:15:25 -07:00
Jessica Frazelle
f549b1c9ea
fix copy of multiple rpms 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:14:06 -07:00
Sebastiaan van Stijn
6b1a643ac8 deb: add fish completions 
This adds the Fish completions to the .deb package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-10-17 23:28:11 -07:00
Sebastiaan van Stijn
fb372e66bb 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>
 2015-10-17 22:58:09 -07:00
Sebastiaan van Stijn
cffd50752c Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build 
Vendoring new go-check checkers and use checker for docker_api_build_test.go
 2015-10-17 08:50:51 -07:00