Commit graph

27916 commits

Author SHA1 Message Date
Darren Stahl
6482410c9d Enabled more test on Windows, API and Build
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-06 17:18:42 -07:00
Tonis Tiigi
5fc71599a0 Deprecate repo:shortid syntax
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-06 17:12:17 -07:00
Victor Vieux
2fd674a00f Merge pull request #27184 from tiborvass/gnupg-debian-stretch
install: fix debian stretch
2016-10-06 14:20:03 -07:00
Tibor Vass
047264763a install: fix debian stretch
Apparently, Debian stretch does not come with gpg installed by
default. This patch ensures that gpg is installed.

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-10-06 22:23:08 +02:00
John Howard
b7f537e811 Inspect populate image OSVersion
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-06 11:46:24 -07:00
Justin Cormack
5ee2c2a647 Merge pull request #27160 from mlaventure/update-containerd
Update containerd and runc
2016-10-06 19:36:31 +02:00
John Howard
e85867cb68 Windows: Support credential specs
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-06 09:32:22 -07:00
Brian Goff
28cca5dcaa Merge pull request #27170 from fivestars/26991-consolez
Force input stream ANSI emulation for ConsoleZ
2016-10-06 17:37:16 +02:00
John Howard
efa82c6561 Merge pull request #26926 from darrenstahlmsft/RevendorHcshim
Revendor hcsshim to v0.5.1
2016-10-06 08:35:37 -07:00
Antonio Murdaca
dd2e1947dc
daemon: add --userland-proxy-path flag
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-06 17:31:53 +02:00
Brian Goff
f19120c305 Merge pull request #27167 from Microsoft/jjh/blockexport
Windows: export not supported
2016-10-06 16:05:36 +02:00
Brian Goff
48a75f6493 Merge pull request #27183 from darrenstahlmsft/BuildTests
Enable more build tests on Windows
2016-10-06 15:52:45 +02:00
Sebastiaan van Stijn
16a45dba89 Merge pull request #26797 from srodman7689/friendly_error_on_permissions_connection_error
Closes #26761 Updated the client/request.go sendClientRequest method to return a Pe…
2016-10-06 14:13:41 +02:00
Vincent Demeester
2160953d26 Merge pull request #27181 from sdurrheimer/zsh-completion-daemon-init-path
Add zsh completion for 'dockerd --init-path'
2016-10-06 10:58:21 +02:00
Darren Stahl
443d7313f5 Enable more build tests on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-06 00:53:30 -07:00
Sebastiaan van Stijn
306912eb92 Update reviewing process for unified docs repo
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-06 09:35:22 +02:00
Steve Durrheimer
3db5222340
Add zsh completion for 'dockerd --init-path'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-06 07:38:39 +02:00
Matthew Lapworth
0a43c5fedb
Fixed issue when running trust example where the notary server tag wasn't found.
Signed-off-by: Matthew Lapworth <matthewl@bit-shift.net>
2016-10-05 21:05:17 -07:00
Doug Davis
28a9a7deb0 Don't env-var evaluate labels from docker build cmd line
Fixes #26027

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-10-05 18:17:02 -07:00
Tonis Tiigi
9d8f01b4f5 Improve TestAttachClosedOnContainerStop
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-05 15:52:09 -07:00
Kenfe-Mickael Laventure
7e12c3bb99 Update containerd and runc
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-05 14:47:15 -07:00
Darren Stahl
267c04aa36 Revendor hcsshim to v0.5.1
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-05 14:40:51 -07:00
Alexander Morozov
921a0bf686 Merge pull request #26932 from dmcgowan/update-tar-split
Update tar split
2016-10-05 13:45:07 -07:00
Alexander Morozov
33ae7d4c19 Merge pull request #27149 from swernli/servicing_fix
Fixing servicing bug by always specifying LayerFolderPath
2016-10-05 13:21:47 -07:00
John Howard
73932d8d22 Windows: export not supported
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-05 13:15:44 -07:00
Michael Crosby
0b86ca9ad0 Merge pull request #26509 from LK4D4/commits_from_vendor
project: move go binaries installation to separate script
2016-10-05 13:15:30 -07:00
Alexander Morozov
ba9fb73280 Merge pull request #27037 from Microsoft/jjh/apistatsdatarace
Fix datarace in ApiStatsNetworkStatsVersioning
2016-10-05 13:06:40 -07:00
Alexander Morozov
f08a450ad3 Merge pull request #25837 from reaperhulk/support-compressing-build-context
Add support for compressing build context during image build
2016-10-05 12:57:46 -07:00
Josh Wilson
c0a5772668 Force input stream ANSI emulation for ConsoleZ
This performs a similar check to the `"ConEmuANSI"` check that was recently
added to enable arrow keys navigation in docker container terminals.

Signed-off-by: Josh Wilson <josh.wilson@fivestars.com>
2016-10-05 12:42:48 -07:00
Tõnis Tiigi
aa8996f70b Merge pull request #27039 from rojingeorge/patch-1
Updating the DockerFile for build failure, when make build is done, f…
2016-10-05 10:51:42 -07:00
John Howard
825e3a66a4 Fix datarace in ApiStatsnetworkStatsVersioning
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-05 10:12:46 -07:00
Michael Crosby
214b70e6ef Merge pull request #27038 from jstarks/non_base_utilityvm
Windows: support Windows servicing layers
2016-10-05 10:02:31 -07:00
Tõnis Tiigi
67155f1c33 Merge pull request #27146 from duglin/fixCont
Require continuation char to be last char in a line
2016-10-05 09:49:47 -07:00
Kenfe-Mickaël Laventure
2616a909e8 Merge pull request #27153 from vieux/awscli_arm
add awscli to arm Dockerfile
2016-10-05 07:29:36 -07:00
Justin Cormack
6860c101ad Add a script to install a bundle into Docker for Mac
After building docker from the git repo, you can run
```
./contrib/mac-install-bundle.sh install
```
and this will tell Docker for Mac to look for a bundle at the current
path to run instead of the built in version of Docker. This will persist
until you do a factory reset or run
```
./contrib/mac-install-bundle.sh undo
```

A factory reset is advised to reset as a development Docker may break your
install.

The path must be a path that is shared with Docker for Mac so that the VM
can find it - nothing is installed into the image.

This is in `contrib/` as it is a best effort attempt to make it easier for
Docker for Mac users to test master or pull requests. If it breaks anything
a factory reset is your friend.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-05 13:21:18 +02:00
Doug Davis
ed72c65a2a Merge pull request #27154 from pwzgorilla/master
typo: modified `Server` as `Serve`
2016-10-05 07:03:18 -04:00
Phil Estes
5a2c19ac4a Merge pull request #27156 from rheinwein/lf/update-installation-link
Update experimental/README link to binary installation instructions
2016-10-05 12:23:46 +02:00
Justin Cormack
d4b8bf49dd Merge pull request #27042 from mlaventure/remove-ubuntu-wily
Remove Ubuntu 15.10 (Wily Werewolf) from build-deb targets
2016-10-05 12:19:05 +02:00
Justin Cormack
5a1efde8f2 Merge pull request #27139 from runcom/fix-WriteJSON
api/server/httputils: compile with go < 1.7 (WriteJSON)
2016-10-05 12:15:04 +02:00
Laura Frank
65e1103789 Update readme link to binary installation instructions
Signed-off-by: Laura Frank <ljfrank@gmail.com>
2016-10-05 11:13:08 +02:00
mgniu
97a4548bb3 typo: modified Server as Serve
Signed-off-by: mgniu <mgniu@dataman-inc.com>
2016-10-05 12:20:31 +08:00
Brian Goff
c48317ad7c Merge pull request #27152 from darrenstahlmsft/Rounding
Windows: fix rounding error in container resources
2016-10-04 21:08:14 -04:00
Victor Vieux
dbec45fa7a add awscli to arm Dockerfile
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-10-04 16:22:59 -07:00
Stefan J. Wernli
78540d0d18 Fixing servicing bug by always specifying LayerFolderPath
During the recent OCI changes, I mistakenly thought LayerFolderPath is only needed for Windows Server containers (isolation=process) and not for Hyper-V Containers, but it turns out it is also required for servicing containers used to finish installing updates.  Since the servicing containers need to reuse the container's create options, this change makes it so that LayerFolderPath is always filled in for all containers as part of constructing the create options.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-10-04 15:29:30 -07:00
Darren Stahl
1b48203f17 Windows: fix rounding error in container resources
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-04 14:11:32 -07:00
Kenfe-Mickael Laventure
e9a8105708 Remove Ubuntu 15.10 (Wily Werewolf) from build-deb targets
As of July 28, 2016, it is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2016-July/000210.html) and will receive no further updates.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-04 13:01:00 -07:00
Brian Goff
e097c2a938 Merge pull request #27148 from anusha-ragunathan/chg_import_path
Add plugingetter to pkg.
2016-10-04 15:17:08 -04:00
Anusha Ragunathan
d599d53db2 Add plugingetter to pkg.
plugingetter is indepedent of docker/docker packages, so it can be
moved to pkg. This is also necessary for authorization plugins (part of
pkg) to use pluginv2. The original path at plugin/getter will be
eventually removed, when external repos (eg. libnetwork) update their
import paths.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-04 12:03:29 -07:00
Doug Davis
105bc63295 Require continuation char to be last char in a line
While look at #27039 I noticed that we allow for whitespace after
the continuation char (\\) which is wrong. It needs to be the very
last char in the line.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-10-04 09:38:00 -07:00
Charlie Drage
2fb2361b29 Add check for CONFIG_IP_NF_NAT to kernel check
This appears to be missing. NAT (via iptables) is required in order to
setup Docker networking.

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
2016-10-04 12:14:45 -04:00