Commit graph

32943 commits

Author SHA1 Message Date
Vincent Demeester
5fbc82128b Merge pull request #33647 from johnstep/improve-load-error
Stop trying to load images on an incompatible OS
2017-06-29 16:12:32 +02:00
Brian Goff
1ca83a6595 Merge pull request #33831 from cpuguy83/ignore_enotsup_on_relabel
Do not error on relabel when relabel not supported
2017-06-29 10:08:47 -04:00
Brian Goff
fcaa79b842 Merge pull request #33867 from nishanttotla/fix-duplicate-platform-info
Do not add duplicate platform information to service spec
2017-06-29 09:36:01 -04:00
Sebastiaan van Stijn
b7ac1571a3 Merge pull request #33851 from tonistiigi/fix-add-remote
build: fix add from remote url
2017-06-28 23:53:21 -07:00
Nishant Totla
da85b62001
Do not add duplicate platform information to service spec
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-06-28 16:01:05 -07:00
Sebastiaan van Stijn
8b29ba59cc Merge pull request #33809 from Microsoft/jjh/svmdedicatedscratch
LCOW: Dedicated scratch space for service VM utilities
2017-06-28 11:06:46 -07:00
Sebastiaan van Stijn
3d6ab220db Merge pull request #33857 from yongtang/33856-make-test-unit
Fix build error for `make test-unit`
2017-06-28 00:31:42 -07:00
John Howard
950d472c9c Merge pull request #33826 from Microsoft/jjh/lcownits
LCOW: Fix nits from 33241
2017-06-27 22:56:38 -07:00
Yong Tang
fac486d0a0 Fix build error for make test-unit
This fix tries to address the issue raised by #33856 where
`make test-unit` will result in the failure:
```
...
...
dockerversion/useragent.go:20: undefined: Version
dockerversion/useragent.go:22: undefined: GitCommit
ok  	github.com/docker/docker/api	0.026s	coverage: 68.0% of statements
ok  	github.com/docker/docker/api/errors	0.003s	coverage: 100.0% of statements
FAIL	github.com/docker/docker/api/server [build failed]
make: *** [test-unit] Error 2
```

The issue is because in case of `make test-unit`, `source "${MAKEDIR}/.go-autogen"`
is missing.

This caused the `make test-unit` failure.

This fix adds `source "${MAKEDIR}/.go-autogen"` in `hack/make/test-unit`

This fix fixes #33856.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-06-28 03:18:55 +00:00
Sebastiaan van Stijn
acf855bf10 Merge pull request #32977 from imkin/30491-default-container-size
Add overlay2.size daemon storage-opt
2017-06-27 20:00:02 -07:00
Sebastiaan van Stijn
74a5b14c80 Merge pull request #33838 from lixiaobing1/masterRange
optimize for loop with rootfs.DiffIDs
2017-06-27 14:34:10 -07:00
John Howard
4ec9766a27 LCOW: Fix nits from 33241
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-27 11:59:49 -07:00
John Howard
d1d649c891 LCOW: Dedicated scratch space for global service VM
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-27 10:55:16 -07:00
Tonis Tiigi
2981667e11 build: fix add from remote url
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-27 10:38:01 -07:00
Brian Goff
7843bfde36 Merge pull request #33832 from glasser/glasser/msg-source
Fix stderr logging for journald and syslog
2017-06-27 13:30:41 -04:00
Victor Vieux
48e625ccca Merge pull request #33690 from raja-sami-10p/pkg/authorization
Increase test Coverage of pkg/authorization
2017-06-27 10:09:13 -07:00
Vincent Demeester
151c5ea798 Merge pull request #33696 from thaJeztah/fix-git-clone
Fix handling of remote "git@" notation
2017-06-27 16:56:11 +02:00
lixiaobing10051267
80b2c326de optimize for loop with rootfs.DiffIDs
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-06-27 20:31:27 +08:00
Dhawal Yogesh Bhanushali
a63d5bc035 Add overlay2.size daemon storage-opt
This commit adds the overlay2.size option to the daemon daemon
storage opts.

The user can override this option by the "docker run --storage-opt"
options.

Signed-off-by: Dhawal Yogesh Bhanushali <dbhanushali@vmware.com>
2017-06-27 01:07:48 -07:00
Vincent Demeester
359ed99352 Merge pull request #33835 from Microsoft/jjh/changedir
LCOW: Change directory from lcow to "Linux Containers"
2017-06-27 09:33:38 +02:00
John Stephens
bcc8b2bc47 Merge pull request #33815 from jstarks/lcow_command_args
LCOW: pass command arguments without extra quoting
2017-06-26 21:46:29 -07:00
John Howard
2c43cbe0d5 LCOW: Change to c:\Program Files\Linux Containers
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-26 21:26:18 -07:00
John Howard
3f14e25a7f Vendor github.com/jhowardmsft/opengcs v0.0.7
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-26 21:24:39 -07:00
Sebastiaan van Stijn
8f3c526e78 Merge pull request #31497 from dnephin/engine-local-image-data
Add a LastTagTime for images
2017-06-26 18:51:09 -07:00
Aaron Lehmann
da28210a15 Merge pull request #33781 from mlaventure/fix-healhcheck-goroutine-leak
Prevent a goroutine leak when healthcheck gets stopped
2017-06-26 15:34:43 -07:00
John Stephens
b9255e4a53
Stop trying to load images on an incompatible OS
Signed-off-by: John Stephens <johnstep@docker.com>
2017-06-26 15:11:24 -07:00
David Glasser
917050c572 Fix stderr logging for journald and syslog
logger.PutMessage, added in #28762 (v17.04.0-ce), clears msg.Source. So journald
and syslog were treating stderr messages as if they were stdout.

Signed-off-by: David Glasser <glasser@davidglasser.net>
2017-06-26 14:37:43 -07:00
Brian Goff
ebfdfc5768 Do not error on relabel when relabel not supported
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-06-26 17:29:24 -04:00
Daniel Nephin
016eea004b
Set a LastUpdated time in image metadata when an image tag is updated.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-26 12:16:26 -07:00
Sebastiaan van Stijn
d3d1aabcc6
Move IsGitTransport() to gitutils
This function was only used inside gitutils,
and is written specifically for the requirements
there.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-26 10:07:04 -07:00
Sebastiaan van Stijn
913eb99fdc Fix handling of remote "git@" notation
`docker build` accepts remote repositories
using either the `git://` notation, or `git@`.

Docker attempted to parse both as an URL, however,
`git@` is not an URL, but an argument to `git clone`.

Go 1.7 silently ignored this, and managed to
extract the needed information from these
remotes, however, Go 1.8 does a more strict
validation, and invalidated these.

This patch adds a different path for `git@` remotes,
to prevent them from being handled as URL (and
invalidated).

A test is also added, because there were no
tests for handling of `git@` remotes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-26 10:02:12 -07:00
Brian Goff
33fd3817b0 Merge pull request #33814 from vdemeester/update-go-connections
Update go-connections dependency
2017-06-26 10:24:04 -04:00
John Starks
19645521a9 LCOW: pass command arguments without extra quoting
Signed-off-by: John Starks <jostarks@microsoft.com>
2017-06-24 10:23:17 -07:00
Vincent Demeester
d311a3a681 Merge pull request #33798 from vdemeester/move-some-api-code-away
Move some `api` package functions away
2017-06-24 14:30:25 +02:00
Vincent Demeester
497e6e0caa
Update go-connections dependency
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-24 12:40:49 +02:00
Sebastiaan van Stijn
5e2004c1b9 Merge pull request #33812 from thaJeztah/cleanup-gitignore
Cleanup gitignore
2017-06-24 01:34:40 -07:00
Sebastiaan van Stijn
4964b09238 Merge pull request #33674 from raja-sami-10p/pkg/templates
Increase test Coverage of pkg/templates
2017-06-24 01:04:24 -07:00
Sebastiaan van Stijn
5564fad406 Merge pull request #33467 from bschwind/copy-documentation
Add note to CopyToContainer documentation
2017-06-24 00:19:51 -07:00
Sebastiaan van Stijn
a7b24296c8
Cleanup gitignore
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-23 23:04:39 -07:00
Sebastiaan van Stijn
94e9cb13f4 Merge pull request #33801 from albers/completion-dev-environment
Add bash completion to the development container
2017-06-23 22:52:14 -07:00
Sebastiaan van Stijn
8d1ae76dcb Merge pull request #33719 from dnephin/warn-on-empty-continuation-carry
[Builder] Warn on empty continuation lines
2017-06-23 22:52:02 -07:00
Tibor Vass
d75eb735ee Merge pull request #33707 from Syntaxide/s3fix
Fix authorization header handling in downloader script.
2017-06-23 20:27:54 -07:00
Sebastiaan van Stijn
5b54e78947 Merge pull request #33698 from cpuguy83/dm_deferred_delete_default
Enable dm deferred_* with version check
2017-06-23 19:30:05 -07:00
Aaron Lehmann
56ad9bb1b4 Merge pull request #31273 from fabiokung/consistent-ro-view
No container locks on `docker ps`
2017-06-23 15:28:55 -07:00
Aaron Lehmann
6e96eec565 Merge pull request #33804 from clnperez/fix-cli-test-autogen
Fix autogen vars
2017-06-23 15:28:29 -07:00
John Howard
25a65a185b Merge pull request #33785 from Microsoft/jjh/hcsschemaupdate
LCOW: Updates necessary due to platform schema change
2017-06-23 13:08:13 -07:00
Christy Perez
091e07c87d Fix autogen vars
commit ea2e4d73c4 removed the autogen
script, but if you happen to clone the dir fresh from git, you can't
build the integration test binaries.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2017-06-23 14:40:09 -05:00
Vincent Demeester
565aa41392
Move some api package functions away
- DisplayablePorts is a `cli` function, moving to `docker/cli`
- Move MatchesContentType to the only package using it,
  `api/server/httputils` (and remove the deps on logrus for `api` package)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-23 19:37:26 +02:00
Daniel Nephin
b47b375cb8 Add a test for warning on empty continuation lines.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-23 13:15:04 -04:00
Yong Tang
7815c8f875 Warn/deprecate continuing on empty lines in Dockerfile
This fix is related to 29005 and 24693. Currently in `Dockerfile`
empty lines will continue as long as there is line escape before.
This may cause some issues. The issue in 24693 is an example.
A non-empty line after an empty line might be considered to be a
separate instruction by many users. However, it is actually part
of the last instruction under the current `Dockerfile` parsing
rule.

This fix is an effort to reduce the confusion around the parsing
of `Dockerfile`. Even though this fix does not change the behavior
of the `Dockerfile` parsing, it tries to deprecate the empty line
continuation and present a warning for the user. In this case,
at least it prompt users to check for the Dockerfile and avoid
the confusion if possible.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-06-23 13:04:40 -04:00