062d0b3921
read seccomp profile locally then pass to daemon
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-12 13:12:29 -08:00
ca60e6262b
Vendor engine-api 0.2.1.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-12 13:19:16 -05:00
c72be040bb
Merge pull request #19187 from estesp/lets-do-this
...
User namespaces: graduate from experimental
2016-01-12 09:34:19 -08:00
656979670c
Merge pull request #18998 from calavera/syslog_tls
...
Allow syslog over TCP+TLS.
2016-01-11 17:21:38 -08:00
df40c61f8a
Make Makefile work on OS X
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-11 18:16:56 -05:00
f11b6a2ab3
Merge pull request #18785 from aaronlehmann/new-manifest
...
New image manifest format
2016-01-11 12:01:46 -08:00
a4b77dc1af
Windows CI: Setup for testing against Windows
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-11 11:52:03 -08:00
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
ad2966a315
Merge pull request #19138 from Microsoft/jjh/failedtodockerversion
...
Windows CI: More debugging
2016-01-10 18:11:19 -08:00
fe3d1f9dd7
Merge pull request #19198 from sanimej/vin
...
Vendoring libnetwork
2016-01-10 11:46:34 -08:00
290ba41c00
Vendor updated github.com/docker/distribution
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-08 17:24:20 -08:00
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
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
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
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
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
1c979f7587
Merge pull request #18887 from riyazdf/notary-delegations
...
notary delegation integration into docker
2016-01-08 10:37:55 -08:00
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
19b063e740
Vendoring libnetwork
...
- 49c24217054e269aad3dbfd81ee32780b104dd84
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-08 09:19:31 -08:00
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
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
1c125f50cf
Notary delegation integration into docker
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-07 19:35:45 -08:00
1feeecf6e5
Vendor engine-api 0.1.3.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-07 21:02:19 -05:00
c64f9407a4
Add missing ? to specfile variable.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-08 11:06:21 +11:00
d76640d78a
Merge pull request #19145 from vdemeester/vendor-my-precious
...
Add a validate-vendor script
2016-01-07 13:53:01 -08:00
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
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
131e2bf12b
Merge pull request #19068 from calavera/vendor_engine_api
...
Introduce the new engine-api library.
2016-01-07 11:14:37 -05:00
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
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
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
91201678c6
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
...
See 99433d2ca2/README.md (architectures-other-than-amd64)
2016-01-06 14:34:29 -08:00
676118670d
Windows CI: More debugging
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-06 11:44:07 -08:00
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
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
a3858873fa
Windows CI: No integration daemon stop
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-05 10:52:59 -08:00
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
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
8213f8caaa
Adding Jenkins CI script to sources
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-04 15:53:30 -08:00
327421d1df
add more seccomp profile tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-30 17:30:44 -08:00
626c933730
cleanup jess/unshare image
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-30 16:20:05 -08:00
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
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
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
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
a48fe62384
add default seccomp profile tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-28 10:26:48 -08:00
d4270c1764
Merge pull request #18775 from mrjana/mh
...
libnetwork vendoring
2015-12-26 11:42:55 +01:00
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
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
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
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
ad7fa01102
Vendor new connections library.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-22 13:31:46 -05:00
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
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
Jessica Frazelle
David Calavera
Sebastiaan van Stijn
Tibor Vass
Arnaud Porterie
John Howard
Tibor Vass
Aaron Lehmann
cyli
Santhosh Manohar
Tianon Gravi
Phil Estes
Jess Frazelle
Alessandro Boch
Riyaz Faizullabhoy
Lei Jitang
Avi Miller
Vincent Demeester
moxiegirl
Sebastiaan van Stijn
Srini Brahmaroutu
Daniel Nephin
Jana Radhakrishnan
Stefan Scherer
Govinda Fichtner
Alexander Morozov
Justas Brazauskas
Mrunal Patel
Phil Estes
Riku Voipio
Qiang Huang
Christopher Jones
André Martins
Doug Davis
Tonis Tiigi
Vincent Batts
Nalin Dahyabhai
Zhang Wei
Antonio Murdaca
Martin Kelly