dc430944b9
Merge pull request #22262 from kencochrane/fix_release_deb
...
Create the correct directory structure for apt-ftparchive
2016-05-11 12:38:12 -10:00
e421668b1b
Merge pull request #21708 from tianon/InRelease
...
Also generate "InRelease" files for newer APT clients
2016-05-11 13:21:15 -04:00
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
Arnaud Porterie
Tibor Vass
Alexander Morozov
Amit Krishnan
Michael Crosby
cyli
Mrunal Patel
Vincent Demeester
Kenfe-Mickael Laventure
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