da74f9653d
Merge pull request #22642 from amitkris/uprev_gozfs
...
update go-zfs to include Solaris support
2016-05-11 07:41:17 -07:00
efb3946171
update go-zfs to include Solaris support
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-05-10 13:51:03 -07:00
4e290986cd
Update protobufs to 8d92cf5fc15a4382f8964b08e1f42a
...
This syncs the protobuf version with the one that is used with
containerd.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-09 15:21:41 -07:00
cfb9764386
Update runc and containerd deps
...
containerd: 57b7c3da915ebe943bd304c00890959b191e5264
runc: d49ece5a83da3dcb820121d6850e2b61bd0a5fbe
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-09 15:05:44 -07:00
a603fa33d5
Merge pull request #22317 from cyli/bump-notary-version
...
Bump notary version to v0.3.0-RC1
2016-05-06 12:54:53 -07:00
ebc5a61593
Merge pull request #22076 from thtanaka/rpmbuild-error
...
DWZ problem with multiple golang binary caused OL7 RPM build to fail
2016-05-06 11:22:27 -07:00
4531c01509
Merge pull request #22236 from kencochrane/remove_git_from_rpm
...
Exclude .git directories from the source RPMS and debian packages
2016-05-06 11:16:12 -07:00
88c6675ed2
Bump notary version to v0.3.0-RC1
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-06 10:59:26 -07:00
97d95604e0
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-05-05 18:36:09 -04:00
af916d316a
Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files
...
Add dockerd to the list of files included in generated rpms
2016-05-05 13:16:06 +02:00
4de672690c
Merge pull request #22270 from runcom/too-many-login
...
distribution: errors: do not retry if too many login attempts
2016-05-05 09:44:09 +02:00
6118952e44
Add dockerd to the list of files included in generated rpms
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-04 20:45:22 -07:00
0c68402887
Merge pull request #22403 from mlaventure/fix-docker-build-pkgs
...
Update build-deb to make correct use of DOCKER_BUILD_PKGS
2016-05-04 17:55:20 -04:00
305ebfda8b
vendor docker/distribution 9ec0d742d6
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-04 18:57:35 +02:00
20e1b9593e
Update build-deb to make correct use of DOCKER_BUILD_PKGS
...
An environment variable cannot directly be used as a bash array, this
patch loops through all the IFS separated value (which default to
space) instead.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-02 11:22:01 -07:00
988f481643
Update engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-02 14:17:40 -04:00
ba6209f744
Merge pull request #22367 from dnephin/fix_dockerd_lookup_and_warn
...
Fix lookup of dockerd when called from outside of $PATH
2016-05-02 13:58:57 -04:00
8983d42988
Raise a more relevant error when dockerd is not available on the platform.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-02 11:59:25 -04:00
ba901bb062
Vendor engine-api with pull fixes
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-04-30 17:24:25 +02:00
57aef3b490
Windows: Support running dockerd as a service
...
This adds support for Windows dockerd to run as a Windows service, managed
by the service control manager. The log is written to the Windows event
log (and can be viewed in the event viewer or in PowerShell). If there is
a Go panic, the stack is written to a file panic.log in the Docker root.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-26 14:04:47 -07:00
0c7eab3157
Make dockerd debuggable
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 09:35:22 -07:00
dc7664d62e
Merge pull request #22308 from tianon/dockerd-consistency
...
Tweak hack/make/*-{client,daemon} to be consistent
2016-04-26 15:32:06 +02:00
f1ad6f127b
Exclude .git directories from the source RPMS
...
Ignore .git directory when creating debian sources
Added missing DOCKER_GITCOMMIT env variable to build-deb
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-26 09:26:32 -04:00
dc98cb534e
Merge pull request #22321 from Microsoft/jstarks/revendor_ansiterm
...
Windows: revendor Azure/go-ansiterm
2016-04-26 08:19:47 +02:00
78895c92c2
Merge pull request #22275 from Microsoft/jstarks/no_rsrc
...
Windows: Add file version information
2016-04-25 20:53:19 -07:00
e2c40555f7
Merge pull request #22318 from mrunalp/mount_label_fix
...
Fix mount label
2016-04-25 19:54:32 -04:00
fab67ab677
Windows: revendor Azure/go-ansiterm
...
go-ansiterm was previously pulling the testing package into the docker
binaries.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-25 15:57:59 -07:00
e0f98c698b
Update runc and spec dependencies for mount label
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Set up the mount label in the spec for a container
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-04-25 14:26:49 -07:00
da92dad59f
Adding servicing update to postRunProcessing for Windows containers.
...
This change enables the workflow of finishing installing Windows OS updates in the container after it has completed running, via a special servicing container.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-04-25 12:16:26 -07:00
626d25a7d9
Tweak hack/make/*-{client,daemon} to be consistent
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-04-25 11:40:36 -07:00
e974eadd94
Merge pull request #22303 from kencochrane/fix_integration_daemon_start
...
Fixing the PATH in .integration-daemon-start to find dyn docker binary
2016-04-25 14:39:45 -04:00
5ee737c70c
Fixing the PATH in .integration-daemon-start to find dynamic docker binary
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-25 11:18:34 -04:00
f9e03d52e9
Change name from docker-client to docker in dynbinary-client
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-25 10:44:37 -04:00
4677f8036e
Windows: Add file version information
...
This change adds file version information to docker.exe and dockerd.exe by
adding a Windows version resource with the windres tool.
This change adds a dependency to binutils-mingw-w64 on Linux, but removes
a dependency on rsrc. Most Windows build environments should already have
windres if they have gcc (which is necessary to build dockerd).
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-24 10:55:51 -07:00
44ff216985
Add dockerd daemon binary to tgz and zip archives
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-04-23 18:26:05 -04:00
27f44b8af6
Merge pull request #20639 from dnephin/split_client
...
Split the binary into two: client and daemon
2016-04-23 14:14:20 -07:00
c0acfccc7b
Cleanup from CR.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-23 15:05:15 -04:00
f68b61052b
Create the correct directory structure for apt-ftparchive. fixes #22238
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-22 16:28:49 -04:00
199472c75a
Bump containerd to v0.2.1
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-22 09:39:02 -07:00
9e7651db4d
Build two binaries client and daemon.
...
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Change docker-daemon to dockerd.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-22 11:26:01 -04:00
1c967911b9
Update godbus/dbus to v4.0.0
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-04-19 14:51:55 -07:00
04bb3a2f45
Vendoring engine-api to a2999dbd3471ffe167f2aec7dccb9fa9b016dcbc
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-04-19 15:50:20 +02:00
7fd53f7c71
Merge pull request #21657 from vdemeester/update-engine-api
...
Update engine api with required arguments
2016-04-18 19:47:22 -07:00
1cd7dd8917
Merge pull request #22082 from tiborvass/revert-go-security-fix-for-windows
...
Workaround Windows bug discovered with Go security fix
2016-04-18 12:44:13 -07:00
2b6d7f728e
Merge pull request #22088 from amitkris/update_fsnotify
...
Update fsnotify to v1.2.11
2016-04-18 12:38:29 -07:00
9b6c055f92
Merge pull request #22098 from thaJeztah/cherry-pick-21998
...
cherry-pick "runc install path changed from /usr/local/bin to /usr/local/sbin"
2016-04-18 11:09:55 +02:00
b1459f1b94
Vendoring libnetwork v0.8.0-dev.1
...
- Fixes docker/docker#16964
- Added maximum egress bandwidth qos for Windows
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-04-17 11:17:48 -07:00
cbb6c6e959
runc install path changed from /usr/local/bin to /usr/local/sbin
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 3d85e51ef4284f572cb658cfe69edc92ac3a53bb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-17 01:36:53 +02:00
ae75a7d3b2
Update fsnotify to v1.2.11
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-04-15 18:40:07 -07:00
3b3e58b639
Workaround Windows bug discovered with Go security fix
...
For context: https://github.com/golang/go/issues/15286
This commit downloads go1.5.3 in addition to go1.5.4 in order to
workaround the issue.
It is not expected to do a Docker release without a proper fix, however
this should help unblock Docker development on Windows TP5.
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-04-15 21:00:45 -04:00
c892a8d620
DWZ problem with multiple golang binary caused OL7 RPM build to fail
...
Refering to this: https://fedoraproject.org/wiki/PackagingDrafts/Go
this could be due to the following bug:
https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
This fixes #22051
Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
2016-04-15 09:48:53 -07:00
9802d7d10f
Vendor engine-api with required arguments
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-04-15 10:11:05 +02:00
355ad33087
Fix detection of git commit during build from tarball
...
Distro packagers will often use the tarball to build a package and have
the build script for the package in git. To avoid that the docker build
script picks up the git commit from the distro repo we also check for a
directory named .git before check for -unsupported builds.
Signed-off-by: Natanael Copa <natanael.copa@docker.com>
2016-04-14 17:30:18 +02:00
40502e3813
Merge pull request #21949 from aaronlehmann/vendor-distribution-1622
...
Vendor distribution to correct config blob media type in schema2 manifest
2016-04-12 21:23:22 -04:00
7b5a6844c2
Merge pull request #21943 from Microsoft/jstarks/utilityvm
...
Windows: support embedded utility VM images
2016-04-12 10:19:47 -07:00
c18d03a778
Vendor distribution to correct config blob media type in schema2 manifest
...
@nwt noticed that the media type specified in the config section of a
schema2 manifest is application/octet-stream, instead of the correct
value application/vnd.docker.container.image.v1+json.
This brings in https://github.com/docker/distribution/pull/1622 to fix
this.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-04-11 17:29:17 -07:00
15b0f06a9a
Windows: Revendor Microsoft/hcsshim
...
This change supports the importing of layers that contain utility VM
images. This is necessary to support Hyper-V containers running on a
non-centrally-managed image.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-11 13:23:38 -07:00
45fb803316
Improve source for containerd/runc copy
...
This improves getting the source for the binaries that are compiled on
the system so that they can be copied into the bundles output.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-11 12:02:01 -07:00
6dd2c33217
Vendor Libnetwork v0.7.0-rc.6
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-04-09 10:45:13 -07:00
9b486999f2
Windows: revendor Microsoft/go-winio and Microsoft/hcsshim
...
These changes add support for importing base layers and change the tar
metadata for Windows layers to better match the intent of the tar format.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-07 17:52:27 -07:00
07fe6947a4
vendor: patch template init in trace pkg for performance
...
Temporarily include a fork of golang/net package
that includes a performance patch. Measured performance
gain is ~60ms for every `docker run` command.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-07 11:02:14 -07:00
e82830ecde
Merge pull request #21628 from clnperez/systemd-tasksmax-workaround
...
Build-deb hack for systemd tasksmax
2016-04-07 12:30:45 -04:00
2b849e0263
Build-deb hack for systemd tasksmax
...
Since we can't use the TasksMax value in the docker.service
file by default, we can uncomment it at buildtime.
See docker/docker/pull/21491 for some background.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2016-04-07 11:08:30 -05:00
d82e522e36
Merge pull request #21810 from aboch/vnd
...
Vendoring libnetwork v0.7.0-rc.4
2016-04-06 14:18:33 -07:00
5709f8e422
Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys
...
Client print error when specify wrong detach keys
2016-04-06 22:14:14 +02:00
8a957bafa5
Vendoring libnetwork v0.7.0-rc.4
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-04-06 12:18:21 -07:00
a79e79c58e
Merge pull request #21780 from sanimej/libn-v0.7rc2
...
Vendor Libnetwork v0.7.0-rc.3
2016-04-06 13:54:21 -04:00
5b892819a6
Vendor Libnetwork v0.7.0-rc.3
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-04-05 22:01:19 -07:00
3f81b49352
Define readonly/mask paths in spec
...
This vendors in new spec/runc that supports
setting readonly and masked paths in the
configuration. Using this allows us to make an
exception for `—-privileged`.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-04 18:55:55 -07:00
e7d54a4133
Fixed a typo in release.sh
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-04 09:27:14 -04:00
e1a4332c13
vendor engine-api 8924d6900370b4c7e7984b
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-04-04 15:32:26 +08:00
b82fc524a7
Also generate "InRelease" files for newer APT clients
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-03-31 17:39:50 -07:00
3acb466f2d
Merge pull request #21695 from kencochrane/change_tgz_to_zip_on_windows
...
Change the windows bundle from a .tgz to a .zip file
2016-03-31 18:40:37 -04:00
fda99a7e16
Change the windows .tgz to a .zip file
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-31 15:56:13 -04:00
00031c15b5
Merge pull request #21679 from tonistiigi/no-pivot-root
...
Bring back support for DOCKER_RAMDISK
2016-03-31 12:40:57 -07:00
8a4225cd5a
Bring back support for DOCKER_RAMDISK
...
Fixes #21631
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-31 10:29:32 -07:00
60821fe288
Merge pull request #21665 from cyphar/bump-runc
...
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
2016-03-31 11:38:57 +02:00
90bb5301b5
Vendor Libnetwork v0.7.0-rc.1
...
- Fixes https://github.com/docker/libnetwork/issues/1051
- Fixes https://github.com/docker/libnetwork/issues/985
- Fixes https://github.com/docker/libnetwork/issues/945
- Log time taken to set sandbox key
- Limit number of concurrent DNS queries
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-30 18:12:23 -07:00
da38ac6c79
vendor: bump runc to 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
...
Also modify an integration test that hardcoded the error string so it
uses the exported error variable from libcontainer/user.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-31 11:20:38 +11:00
8c06ba3665
Merge pull request #21625 from kencochrane/fix_tgz_directory
...
Change the directory inside of tgz files.
2016-03-30 13:11:55 -07:00
d800be743d
Merge pull request #21591 from riyazdf/hardware-signing-non-experimental
...
move hardware signing out of experimental, remove yubico-piv-tool deps
2016-03-30 00:09:22 -04:00
7df5b32834
Change the directory inside of tgz files.
...
Currently the directory inside of the tgz files is /usr/local/bin
and this is causing some confusion, and problems with people who already
have stuff in those directories. This commit changes the directory
to /docker to help remove the confusion.
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-29 14:39:28 -04:00
d78f8f2796
Merge pull request #21608 from albers/build-clone-https
...
Use https for `git clone` in build
2016-03-29 11:30:35 -07:00
0fa96f2463
Merge pull request #21593 from aboch/bdvnd
...
Vendoring boltb/bolt v1.2.0
2016-03-29 11:29:30 -07:00
a7e9bf6cb7
Use https for `git clone` in build
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-03-29 09:35:42 +02:00
eeaf14395e
Merge pull request #21541 from yongtang/20909-engine-api
...
Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
2016-03-28 19:01:15 -07:00
16bf3eede0
Vendoring boltb/bolt v1.2.0
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-28 15:49:41 -07:00
8d18e6b30f
move hardware signing out of experimental, remove dependencies to yubico-piv-tool
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-28 14:33:06 -07:00
270562f439
Update vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9.
...
This PR updates vendored engine-api to e37a82dfcea64559ca6a581776253c01d83357d9
in order to support `SecurityOptions` in `Info`.
See #20909 , #21172 for details related to `SecurityOptions`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-03-28 13:38:15 +00:00
477fe4846a
Add support for repeating integration tests
...
`TEST_REPEAT=n` runs the test suite again n times or
until the first failure without doing building and
daemon setup. Useful for debugging flaky tests.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-26 23:05:55 -07:00
2c224fb06a
Merge pull request #21509 from kencochrane/add_better_unsupported_message
...
Added a better message for when we build an unsupported Docker version
2016-03-25 13:46:41 -04:00
996138bf8e
Fix release scripts
...
Add some missing dependencies in the Dockerfile:
- apt-utils for apt-ftparchive.conf
- bsdmainutils for our use of the column command in
hack/make/generate-index-listing
We also ensure that the docker daemon is started before calling
release-deb or release-rpm, since .detect-daemon-osarch, which is sourced
in each of them, requires the daemon to be running.
This commit also gets completely rid of s3cmd and fixes references to
AWS_* environment variables (changing from AWS_ACCESS_KEY to
AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order
to please awscli. Also AWS_DEFAULT_REGION is now important to specify,
the default has been set to the region used by get.docker.com and
test.docker.com.
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-25 11:55:26 -04:00
181d2725d7
Added a better message for when we build an unsupported version
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-25 10:09:03 -04:00
36458b5787
Merge pull request #21501 from tonistiigi/fix-deb-init-symlinks
...
Fix symlink copying for deb init scripts
2016-03-25 01:08:09 -07:00
61277c395b
Fix symlink copying for deb init scripts
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-24 23:15:17 -07:00
dd33d18045
Revert "Merge pull request #21003 from riyazdf/hardware-signing-ga"
...
This reverts commit e6d3a9849cd3afe34b51
2016-03-24 21:12:52 -07:00
ed25df9a07
Merge pull request #21387 from kencochrane/change_packages
...
Packaging changes required for new containerd binaries
2016-03-24 17:29:55 -04:00
bb66d7144f
Packaging changes required for new containerd binaries
...
These are the changes required due to the new binaries that containerd introduced.
The rpm, and deb packages now include 5 binaries.
docker, containerd, containerd-shim, ctr, and runc
The tar files also include all 5 binaries.
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
2016-03-24 16:25:33 -04:00
e88dff6bb4
Merge pull request #21435 from vdemeester/remove-verbose-copy-containerd
...
Remove the verbosity of copy_containerd
2016-03-24 10:34:37 -07:00
2164018d82
Remove the verbosity of copy_containerd
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-03-23 20:51:48 +01:00
58385bc8a5
Vendor engine-api 0.3.1.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-23 15:05:19 -04:00
dd51e85c05
Fix release.sh script
...
Use aws instead of s3cmd.
Make sure the release script works with the docker-prepended binary
names.
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 11:59:21 -04:00
009399dc8e
Add `docker-` prefix to runc and containerd binaries
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 00:52:16 -04:00
d0d17a0693
Merge pull request #21397 from kencochrane/update-release-script
...
Updated release.sh script to stop uploading binaries
2016-03-22 20:29:16 -04:00
d02d48b4b1
Merge pull request #21402 from crosbymichael/tar-binaries
...
Add containerd and runc binaries to tgz output
2016-03-22 17:11:34 -07:00
28af4789e6
Merge pull request #21410 from calavera/vendor_engine_api_v0.3.0
...
Vendor engine-api v0.3.0
2016-03-22 16:41:10 -07:00
5ff66748da
Export GOOS and GOARCH in subprocess for tgz
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-22 15:43:06 -07:00
9e9c73a528
Vendor engine-api v0.3.0
...
I tagged the current commit so we have a better reference
of what's in this release.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-22 18:12:16 -04:00
506fb9810c
Merge pull request #21396 from aboch/vnn
...
Vendoring libnetwork v0.7.0-dev.10
2016-03-22 15:09:42 -07:00
8b8fcb796f
Merge pull request #21303 from riyazdf/notary-vendor-docker1.11
...
vendor notary for docker1.11
2016-03-22 17:57:17 -04:00
fbdb3c3a4b
Vendoring libnetwork v0.7.0-dev.10
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-22 12:36:21 -07:00
aca7e73a69
Copy containerd binaries in tgz
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-22 12:23:17 -07:00
53d2e5e9d7
Merge pull request #21270 from ehazlett/resource-labels
...
Add Label support for Images (build), Networks and Volumes on Creation
2016-03-22 15:12:33 -04:00
78568f2eb5
Add function for copy containerd
...
This adds a function for copying containerd and other binaries as well
as adding a hash for those files.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-22 12:06:56 -07:00
ab3772f72f
vendor notary for docker1.11
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-22 11:28:19 -07:00
5e3a8ef887
Updated release.sh script to stop uploading binaries
...
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
2016-03-22 13:42:54 -04:00
0dcdd1c5b8
Merge pull request #21341 from duglin/tweakBuild
...
Add containerd/runc exes to bundle dir after build
2016-03-22 10:29:56 -07:00
fc214b4408
add label support for build, networks and volumes
...
build: implement --label
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
network: allow adding labels on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
volume: allow adding labels on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
add tests for build, network, volume
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
vendor: libnetwork and engine-api bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2016-03-22 11:49:06 -04:00
1bf5eb20e5
Add containerd/runc exes to bundle dir after build
...
Not sure if this is the right setup given the containerd change but I need
to have the built version of the nested exes (containerd, runc...) available
to me after the build is completed so I'm always testing using the latest
versions. This PR will copy them into the same bundles dir so people can
them use them if they wish w/o having to build each separately.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-03-21 17:50:59 -07:00
d82ad12df8
Merge pull request #19439 from pcarrier/pcarrier/19438-async-connections-to-fluentd
...
fluentd logger: support all options besides Unix sockets
2016-03-21 18:09:14 +01:00
a05fdd6806
Merge pull request #21283 from runcom/update-test
...
vendor docker/distribution d06d6d3b09
2016-03-21 09:46:28 -07:00
3cf8a9ede7
Update vendored engine-api for OpenBSD support
...
Signed-off-by: Frank Groeneveld <frank@frankgroeneveld.nl>
2016-03-21 12:11:11 +01:00
9c2a0739fb
bump fluent-logger-golang version
...
This version supports async connections.
Signed-off-by: Pierre Carrier <pierre@meteor.com>
2016-03-20 16:22:21 +00:00
f10c8e786b
Fix debian policy rule
...
Fix issue in debian policy by removeing double quotes.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
2016-03-19 20:58:19 +01:00
c48439af7f
vendor docker/distribution d06d6d3b09
...
- fix and add integration tests
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-19 12:19:48 +01:00
cc83031ade
Vendor containerd, specs, runc
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-18 13:38:26 -07:00
14299daaca
Vendor updated grpc, protobuf
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-18 13:38:21 -07:00
b54058bafe
Windows: revendor Microsoft/hcsshim to v0.1.0
...
This (the first tagged hcsshim release) fixes long-path bugs on
Windows TP5 that affect commit and save. These bugs were blocking
commit of Windows containers that had node.js installed.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-03-17 21:08:07 +00:00
e6d3a9849c
Merge pull request #21003 from riyazdf/hardware-signing-ga
...
Move hardware signing out of experimental
2016-03-17 14:16:40 -04:00
4227119588
Merge pull request #21261 from aboch/vnd
...
Vendoring libnetwork v0.7.0-dev.8
2016-03-16 18:56:49 -07:00
6223291965
Vendoring libnetwork v0.7.0-dev.8
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-16 13:45:34 -07:00
48339017db
Vendor engine-api to fba5dc8
...
It plumbs net/context.Context through entire API, see docker/engine-api#140
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-03-16 20:25:09 +01:00
02476b23a7
Clean Vagrantfile from vendoring
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-03-16 20:25:04 +01:00
f7fa83c910
Improve messaging and binary generation for pkcs11
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-16 09:43:06 -07:00
3221c7a3c6
Merge pull request #21235 from Microsoft/jstarks/add_npipe_close_write
...
Windows: fix various npipe bugs
2016-03-16 08:23:39 -07:00
87c2aad6f1
Windows: revendor go-winio with npipe fixes
...
This revendor provides support for CloseWrite() in the npipe transport,
fixes a performance regression introduced in Go 1.6, and improves
npipe performance by allowing the pipe buffer size to be specified.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-03-15 18:25:34 -07:00
133b3cccb5
Merge pull request #21108 from tianon/detect-daemon-osarch
...
Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection"
2016-03-15 17:00:55 -07:00
0f59b0b12c
Merge pull request #19831 from cloudflare/optimize-gelf
...
GELF logger: Add gelf-compression-type and gelf-compression-level
2016-03-15 22:35:46 +01:00
6c2f4381d3
Merge pull request #21226 from calavera/fix_experimental_deb_builds
...
Move debian rules to the right place before creating the package.
2016-03-15 13:37:20 -07:00
027f4fdca6
Move debian rules to the right place before creating the package.
...
debhelper has changed the way it performs path validations and
building the deb package fails when it tries to compress the files.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-15 16:17:38 -04:00
f500951598
Merge pull request #20121 from solganik/master
...
syslog format
2016-03-14 20:09:15 -04:00
3771a1713b
Merge pull request #21131 from estesp/gcc-devmapper-test-broken
...
Fix gcc compile test with proper flag ordering
2016-03-14 09:46:49 -07:00
e84a303543
Add explicit code to handle older versions of Docker, too
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-03-14 09:30:45 -07:00
b9361f02da
Merge pull request #20970 from dmcgowan/login-oauth
...
OAuth support for registries
2016-03-14 15:49:44 +01:00
2d74f78ab5
Merge pull request #21122 from mavenugo/mviv
...
Vendor libnetwork v0.7.0-dev.7 : Experimental MacVlan and IPVlan network drivers
2016-03-13 11:32:58 -07:00
9047cd40c2
Vendor libnetwork v0.7.0-dev.7
...
* Experimental support for macvlan and ipvlan drivers
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-11 14:22:25 -08:00
e207645307
Fix gcc compile test with proper flag ordering
...
This test for libdevmapper was always silently failing because the
linker never got the `-ldevmapper` information. Putting the flag last
corrects the test.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-03-11 15:08:58 -05:00
11d3f7092e
use per-check timeouts
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-11 14:38:52 -05:00
e6e0837cbb
Use forked gocheck and vendor
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-11 14:38:50 -05:00
ae6ee5e4af
upgrade go-gelf vendor
...
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2016-03-11 15:18:58 +00:00
a667cd88c3
Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection"
...
Instead of being split between three files, let's let `hack/make/.detect-daemon-osarch` be our single source of truth for multiarch detection/vars. Not only does it make it slightly easier to make sure we change everything properly when these bits have to change, but it also makes it so that all bits of `hack/make.sh` (especially `hack/make/.ensure-frozen-images`) work properly outside the context of the `Makefile` on all platforms.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-03-10 20:07:21 -08:00
9ad946eded
Merge pull request #21098 from kencochrane/fix_vendoring_script_macosx
...
Fix the vendoring script on MacOS X
2016-03-10 22:45:55 -05:00
94445b2fea
Put back the hack that was originally in place.
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-10 20:27:44 -05:00
9488696814
Fix the vendoring script on MacOS X
...
The version of sed on MacOS X is different then the one on linux. The mac version
requires a parameter for the inline (-i) flag, where this isn't required on linux.
On the mac it thinks the -e flag is the parameter, and it causes the vendoring script
to fail.
This fix adds an empty string '' as a parameter to sed, which works fine on both the
mac and linux versions.
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-03-10 16:43:53 -05:00
2b8e7ad460
Merge pull request #20478 from msabansal/HNSIntegration
...
Windows libnetwork integration
2016-03-10 13:33:04 -08:00
9ff7439162
Merge pull request #20983 from Microsoft/jstarks/fix_save_powershell_remoting
...
Windows: Revendor github.com/Microsoft/go-winio
2016-03-10 08:28:36 -08:00
e8026d8a98
Windows libnetwork integration
...
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-03-09 20:33:21 -08:00
d99be399c3
Merge pull request #21019 from aboch/se
...
Add port configs to Sandbox and libnetwork vendoring
2016-03-09 22:27:37 -05:00
5730259f32
Vendor updates to distribution
...
Pull in changes for refresh token in the registry client
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-03-09 13:47:57 -08:00
f988741823
Fixes #18712 : Vendoring srslog to latest version.
...
In order to solve the issue metioned in https://github.com/docker/docker/issues/18712
it is required to use rfc5424 log formatted message, made available in latest srslog library.
Signed-off-by: Solganik Alexander <solganik@gmail.com>
2016-03-09 22:28:51 +02:00
f446771f0b
Vendor docker/engine-api
...
Vendor docker/engine-api 9bab0d5b73872e53dfadfa055dcc519e57b09439
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-03-09 15:52:44 +08:00
5a65408941
Vendoring libnetwork v0.7.0-dev.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-08 18:47:02 -08:00
845dce8465
Windows: Revendor github.com/Microsoft/go-winio
...
This fixes docker save when the daemon was launched from a remote
PowerShell session.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-03-08 12:27:48 -08:00
471e434400
Merge pull request #21036 from jfrazelle/fix-release-generation
...
only add the suites that exist we dont need the script for this
2016-03-08 15:11:49 -05:00
dc702b6c6b
Merge pull request #20727 from mrunalp/no_new_priv
...
Add support for NoNewPrivileges in docker
2016-03-08 14:26:15 -05:00
0ab5805c08
only add the suites that exist we dont need the script for this
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-03-08 11:08:00 -08:00
2c3e9e5794
Update packaging for yubico
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-07 17:17:15 -08:00
37fa75b344
Move pkcs11 out of experimental, into GA
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-07 10:07:40 -08:00
74bb1ce9e9
Add support for NoNewPrivileges in docker
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Add tests for no-new-privileges
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Update documentation for no-new-privileges
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-03-07 09:47:02 -08:00
53b8b8f058
Windows: Revendor github.com/Microsoft/hcsshim
...
This fixes commit on Windows post-TP4 due to a small change
in behavior in the ExportLayer API.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-03-05 19:10:32 -08:00
6a1ae187d0
Windows CI: Bump timeout for tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-03-04 09:36:46 -08:00
ee2183881b
Update engine-api vendor for UsernsMode
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-03-03 09:11:38 -05:00
15e68dc8ee
Merge pull request #20863 from thaJeztah/add-kernel-memory-warning
...
Add KernelMemory to "info" and show warning
2016-03-03 13:14:51 +01:00
dd850530a9
Vendor engine-api
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-03-02 23:32:25 +01:00
882edc3f0e
Revendor Microsoft/go-winio and Microsoft/hcsshim
...
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-03-02 14:17:13 -08:00
3c4d093bab
Merge pull request #18766 from mikedanese/gcplogs
...
Add logging driver for Google Cloud Logging
2016-03-02 02:09:44 +01:00
36401f20ce
Merge pull request #20617 from nalind/journald-pkgconfig
...
Try to handle changing names for journal packages
2016-03-01 15:38:03 -05:00
b211e57f23
Merge pull request #20774 from hqhq/hq_vender_engine_api
...
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
2016-02-29 18:48:55 +01:00
53b0d62683
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-02-29 19:28:37 +08:00
adac575dd3
Use multiple keyservers in install script
...
This improves on an earlier change by adding another keyserver and using a for loop instead of duplicating the command
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2016-02-26 17:22:00 -08:00
5bfaab984c
Merge pull request #20636 from anusha-ragunathan/apt-ftparchive
...
Always create apt-ftparchive.conf.
2016-02-26 14:12:06 -08:00
0bb1acee37
bumping miekg/pkcs11 dependency for go1.6
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-02-25 21:29:37 -08:00
84dc2d9e70
Vendor in notary v0.2.0
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-02-25 13:40:00 -08:00
f4a1e3db99
Support TLS remote test daemon
...
This will allow us to have a windows-to-linux CI, where the linux host
can be anywhere, connecting with TLS.
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-25 14:12:17 -05:00
123f22004b
vendor: add dependencies of gcplogs driver
...
The added dependencies are:
* golang.org/x/oauth2
* google.golang.org/api
* google.golang.org/cloud
Signed-off-by: Mike Danese <mikedanese@google.com>
2016-02-24 10:42:32 -08:00
d3bffa1639
Revert "vendor: remove fsnotify"
...
This reverts commit bc195e1558
2016-02-23 21:43:27 -05:00
204c7808f9
Always create apt-ftparchive.conf.
...
The Releases file(s) and other bits for EOL-ed distros such as Ubuntu
Vivid should remain untouched when we are releasing debs.
However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/
were being updated for the docker 1.10 release including the Release files.
This is due to apt-ftparchive generating index files for vivid as well,
due to the stale apt-ftparchive.conf
This change always creates config using suites in contrib/reprepro/suites.sh.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-02-23 16:06:43 -08:00
4fc5bd295e
Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
...
It includes fix for parsing systemd cgroup names
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-23 13:37:20 -08:00
6cdc4ba6cd
Try to handle changing names for journal packages
...
When checking if we have the development files for libsystemd's journal
APIs, check for either 'libsystemd >= 209' and 'libsystemd-journal'. If
we find 'libsystemd', define the 'journald' tag, which defaults to using
the 'libsystemd.pc' file. If we find the older 'libsystemd-journal',
define both the 'journald' and 'journald_compat' tags, which causes the
'libsystemd-journal.pc' file to be consulted instead.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2016-02-23 12:24:27 -05:00
2eee613326
Fix some typos in comments and strings
...
Most of them were found and fixed by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-22 20:27:15 +01:00
64785ff146
Merge pull request #20521 from estesp/vendor-engine-api-fix
...
Update engine-api vendoring to latest commit
2016-02-19 15:41:17 -08:00
1c2db56d2f
Update engine-api vendoring to latest commit
...
This picks up the change for `Content-Type` which will help solve issues
with authz plugins.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-19 16:20:27 -06:00
a657cfd68b
Merge pull request #20417 from redbaron/fix-deferred-removal-detection
...
Fix libdevmapper deferred removal detection
2016-02-19 13:58:18 -07:00
3b62a610ec
Merge pull request #20288 from tiborvass/debian-jessie
...
Switch Dockerfile to debian:jessie ... AGAIN
2016-02-19 13:51:30 -07:00
117a982d2e
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
2016-02-18 17:39:46 -08:00
6a8342d63d
Merge pull request #20460 from Microsoft/jjh/latestw2lciscripts
...
Check in latest Win2Lin Jenkins scripts
2016-02-18 15:58:24 -08:00
d86f0d9b6d
Check in latest Win2Lin Jenkins scripts
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-18 11:59:08 -08:00
196b27211b
Vendoring libnetwork v0.7.0-dev.3
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-02-17 17:07:33 -08:00
24152a4231
Fix libdevmapper deferred removal detection
...
When linking, position of `-l` flags is important since
they muse come _after_ any object files which uses symbols
from a specified library, that is due to --as-needed binutils
ld flag enabled by default
Signed-off-by: Maxim Ivanov <ivanov.maxim@gmail.com>
2016-02-17 23:56:21 +00:00
929f62e64d
Merge pull request #20187 from cyphar/vendor-runc
...
[carry 19752] vendor: update runc/libcontainer to v0.0.8
2016-02-17 13:59:00 -08:00
Alexander Morozov
Amit Krishnan
Michael Crosby
cyli
Mrunal Patel
Vincent Demeester
Kenfe-Mickael Laventure
Tibor Vass
Antonio Murdaca
Brian Goff
Daniel Nephin
John Starks
John Howard
Ken Cochrane
John Howard
Stefan J. Wernli
Tianon Gravi
Tibor Vass
David Calavera
Madhu Venugopal
Thomas Tanaka
Natanael Copa
Aaron Lehmann
Santhosh Manohar
Tonis Tiigi
Christy Perez
Sebastiaan van Stijn
Alessandro Boch
Zhang Wei
Antonio Murdaca
Aleksa Sarai
Harald Albers
Riyaz Faizullabhoy
Yong Tang
Evan Hazlett
Doug Davis
Frank Groeneveld
Pierre Carrier
Paul Liljenberg
Phil Estes
Jess Frazelle
Phil Estes
Daniel Dao
Arnaud Porterie
msabansal
Derek McGowan
Solganik Alexander
Jessica Frazelle
Sebastiaan van Stijn
Qiang Huang
Mike Dougherty
Mike Danese
Anusha Ragunathan
Alexander Morozov
Nalin Dahyabhai
Stefan Weil
Maxim Ivanov