2aedd8b160
Fix log readers can block writes indefinitely
...
Before this patch, a log reader is able to block all log writes
indefinitely (and other operations) by simply opening the log stream and
not consuming all the messages.
The reason for this is we protect the read stream from corruption by
ensuring there are no new writes while the log stream is consumed (and
caught up with the live entries).
We can get around this issue because log files are append only, so we
can limit reads to only the section of the file that was written to when
the log stream was first requested.
Now logs are only blocked until all files are opened, rather than
streamed to the client.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e2209185ed1c959131d4068ec7fc93e194dc0802
Component: engine
2017-07-05 14:04:52 -04:00
2f46157f44
Merge pull request #33873 from lixiaobing1/masterissue
...
update url for issue
Upstream-commit: 82390ebf32c3e48d80b862ffe46d4160aa65b728
Component: engine
2017-06-29 13:48:19 -07:00
e0679f41e0
Merge pull request #33827 from cpuguy83/return_ping_data_if_available
...
Set ping version even on error
Upstream-commit: 654bb6368b838bc619a5d612a39abb385fbd45c3
Component: engine
2017-06-29 12:27:23 -07:00
85421deb82
Set ping version even on error
...
In some cases a server may return an error on the ping response but
still provide version details. The client should use these values when
available.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 27ef09a46ffeb8ba42548de937b68351009f30ea
Component: engine
2017-06-29 12:42:14 -04:00
1296f00c8a
Merge pull request #33860 from lixiaobing1/masterFclose
...
add f.Close() after dockerignore.ReadAll(f) before return err
Upstream-commit: e066edcfcfec3b6c4ad61a6a769174453968d62d
Component: engine
2017-06-29 10:19:45 -04:00
8ae901a8e8
Merge pull request #33647 from johnstep/improve-load-error
...
Stop trying to load images on an incompatible OS
Upstream-commit: 5fbc82128b42871734f35b468d410ba182ada917
Component: engine
2017-06-29 16:12:32 +02:00
8e64767c1e
Merge pull request #33831 from cpuguy83/ignore_enotsup_on_relabel
...
Do not error on relabel when relabel not supported
Upstream-commit: 1ca83a6595f1c44b8643714082d2ec0e597d788c
Component: engine
2017-06-29 10:08:47 -04:00
89b4b291d7
Merge pull request #33867 from nishanttotla/fix-duplicate-platform-info
...
Do not add duplicate platform information to service spec
Upstream-commit: fcaa79b842b2e1e64784db8568334bb656a9b99e
Component: engine
2017-06-29 09:36:01 -04:00
53df97e881
update url for issue
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 6fcae83036970dd2aad73127da6cbd0d2becb333
Component: engine
2017-06-29 17:10:02 +08:00
d76f67a9f8
add f.Close() after dockerignore.ReadAll(f) before return err
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3072fce0671c5529a42b9e40a5344cce99318312
Component: engine
2017-06-29 00:51:31 -07:00
cc179a2f74
Merge pull request #33851 from tonistiigi/fix-add-remote
...
build: fix add from remote url
Upstream-commit: b7ac1571a35ce0df42cf96b0ed91f20c33678d31
Component: engine
2017-06-28 23:53:21 -07:00
30ba67aee0
Do not add duplicate platform information to service spec
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: da85b62001ec390bdc30b321c4a5cd23c17eeb81
Component: engine
2017-06-28 16:01:05 -07:00
400dd10c7d
Merge pull request #33809 from Microsoft/jjh/svmdedicatedscratch
...
LCOW: Dedicated scratch space for service VM utilities
Upstream-commit: 8b29ba59ccdd4de45fa25137ec5d5a3845f5f5cc
Component: engine
2017-06-28 11:06:46 -07:00
6a011203cd
Merge pull request #33857 from yongtang/33856-make-test-unit
...
Fix build error for `make test-unit`
Upstream-commit: 3d6ab220db348d82310487e3156d445f19dc0661
Component: engine
2017-06-28 00:31:42 -07:00
08b4e324e5
Merge pull request #33826 from Microsoft/jjh/lcownits
...
LCOW: Fix nits from 33241
Upstream-commit: 950d472c9ce4180b80e28030f7de68ffc3254f97
Component: engine
2017-06-27 22:56:38 -07:00
7a07cf4db4
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 >
Upstream-commit: fac486d0a02d6af2759f6d0e81bd8a23d82d432c
Component: engine
2017-06-28 03:18:55 +00:00
674cb1c136
Merge pull request #32977 from imkin/30491-default-container-size
...
Add overlay2.size daemon storage-opt
Upstream-commit: acf855bf10e16b4282cb14f6cc34e378831a22c8
Component: engine
2017-06-27 20:00:02 -07:00
8266f5c84f
Merge pull request #33838 from lixiaobing1/masterRange
...
optimize for loop with rootfs.DiffIDs
Upstream-commit: 74a5b14c80022392c17100e1cde6727842eceb6f
Component: engine
2017-06-27 14:34:10 -07:00
9a5747b3f9
LCOW: Fix nits from 33241
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4ec9766a27ffb964cec6b8b2745725965b2644aa
Component: engine
2017-06-27 11:59:49 -07:00
92d764e7fb
LCOW: Dedicated scratch space for global service VM
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d1d649c891c8b06567afba7542ea9bf518cdaa02
Component: engine
2017-06-27 10:55:16 -07:00
4c52cfc0fb
build: fix add from remote url
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2981667e11e24e9e1e61252a40ceb11fd7cb9811
Component: engine
2017-06-27 10:38:01 -07:00
59255c95cd
Merge pull request #33832 from glasser/glasser/msg-source
...
Fix stderr logging for journald and syslog
Upstream-commit: 7843bfde36d9ded6fada32f469fe1790316137ae
Component: engine
2017-06-27 13:30:41 -04:00
50b9ac741e
Merge pull request #33690 from raja-sami-10p/pkg/authorization
...
Increase test Coverage of pkg/authorization
Upstream-commit: 48e625ccca176787d56a6e87a0e2cc779ce5b6d3
Component: engine
2017-06-27 10:09:13 -07:00
e3e93a641f
Merge pull request #33696 from thaJeztah/fix-git-clone
...
Fix handling of remote "git@" notation
Upstream-commit: 151c5ea798c476128708a91fda8644a6889c2091
Component: engine
2017-06-27 16:56:11 +02:00
41493b0fad
optimize for loop with rootfs.DiffIDs
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 80b2c326de29552c6ee4072fca75ae00eb3be41a
Component: engine
2017-06-27 20:31:27 +08:00
359031100e
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 >
Upstream-commit: a63d5bc03513755015827d0fe93563240429f1e0
Component: engine
2017-06-27 01:07:48 -07:00
7ef86a57f5
Merge pull request #33835 from Microsoft/jjh/changedir
...
LCOW: Change directory from lcow to "Linux Containers"
Upstream-commit: 359ed993525eecb5009c7be1a48a9d646a9e235f
Component: engine
2017-06-27 09:33:38 +02:00
e2c85453e0
Merge pull request #33815 from jstarks/lcow_command_args
...
LCOW: pass command arguments without extra quoting
Upstream-commit: bcc8b2bc474ef2536bd4bac93a7b94935efaf57a
Component: engine
2017-06-26 21:46:29 -07:00
02efb01414
LCOW: Change to c:\Program Files\Linux Containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2c43cbe0d5132618c74de4631c89c541bbafb8c2
Component: engine
2017-06-26 21:26:18 -07:00
1c03f9a249
Vendor github.com/jhowardmsft/opengcs v0.0.7
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3f14e25a7f67e0236dfdcde792ac571ca7874c47
Component: engine
2017-06-26 21:24:39 -07:00
442b559ba0
Merge pull request #31497 from dnephin/engine-local-image-data
...
Add a LastTagTime for images
Upstream-commit: 8f3c526e7851e047f5dde31bd2ce69f960e1d115
Component: engine
2017-06-26 18:51:09 -07:00
525974b970
Merge pull request #33781 from mlaventure/fix-healhcheck-goroutine-leak
...
Prevent a goroutine leak when healthcheck gets stopped
Upstream-commit: da28210a157a3bf5662f1a049bb10f9b69d2a5a2
Component: engine
2017-06-26 15:34:43 -07:00
836d4632cb
Stop trying to load images on an incompatible OS
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: b9255e4a531d2ad0239481eba2a635f7d48718fb
Component: engine
2017-06-26 15:11:24 -07:00
29123f2ea7
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 >
Upstream-commit: 917050c5728f2fb9958ccb3ab66a23766f741adc
Component: engine
2017-06-26 14:37:43 -07:00
5a81510449
Do not error on relabel when relabel not supported
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ebfdfc5768b74e0a52875cf76a0576bfcd66445c
Component: engine
2017-06-26 17:29:24 -04:00
f5f8240661
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 >
Upstream-commit: 016eea004ba0109d7cd965eab242ed17e4f0f36c
Component: engine
2017-06-26 12:16:26 -07:00
a8f8b4ccd8
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 >
Upstream-commit: d3d1aabcc68f65d40acbf1b3adc02d13997bb8e2
Component: engine
2017-06-26 10:07:04 -07:00
8170be09ea
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 >
Upstream-commit: 913eb99fdcd26a4106250bd40dfe8b9c18564b23
Component: engine
2017-06-26 10:02:12 -07:00
2396f04d09
Merge pull request #33814 from vdemeester/update-go-connections
...
Update go-connections dependency
Upstream-commit: 33fd3817b0f5ca4b87f0a75c2bd583b4425d392b
Component: engine
2017-06-26 10:24:04 -04:00
a08baae726
LCOW: pass command arguments without extra quoting
...
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 19645521a92869be7210fb663ed5e0e82e329ca5
Component: engine
2017-06-24 10:23:17 -07:00
aaa2288536
Merge pull request #33798 from vdemeester/move-some-api-code-away
...
Move some `api` package functions away
Upstream-commit: d311a3a681f918906249a1678eab0136ac663f6e
Component: engine
2017-06-24 14:30:25 +02:00
3172848991
Update go-connections dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 497e6e0caaf805f8693c35cb45edbc8f734f09f2
Component: engine
2017-06-24 12:40:49 +02:00
d532fc19ff
Merge pull request #33812 from thaJeztah/cleanup-gitignore
...
Cleanup gitignore
Upstream-commit: 5e2004c1b9e1cab4b2ac3ba7c8edfd959a67c836
Component: engine
2017-06-24 01:34:40 -07:00
7efc650625
Merge pull request #33674 from raja-sami-10p/pkg/templates
...
Increase test Coverage of pkg/templates
Upstream-commit: 4964b092384a0e1c42b2db728aeeaf129a50f54f
Component: engine
2017-06-24 01:04:24 -07:00
ee1b2dfe8c
Merge pull request #33467 from bschwind/copy-documentation
...
Add note to CopyToContainer documentation
Upstream-commit: 5564fad4068619e7d0c5fd7defe7dd5e3f0edd8c
Component: engine
2017-06-24 00:19:51 -07:00
ea9175efe5
Cleanup gitignore
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a7b24296c8ad7928ba56a4c2ecd675a34934177d
Component: engine
2017-06-23 23:04:39 -07:00
c842c1cbcc
Merge pull request #33801 from albers/completion-dev-environment
...
Add bash completion to the development container
Upstream-commit: 94e9cb13f436509e0c64a17df16b4e9cad536704
Component: engine
2017-06-23 22:52:14 -07:00
c080f953a4
Merge pull request #33719 from dnephin/warn-on-empty-continuation-carry
...
[Builder] Warn on empty continuation lines
Upstream-commit: 8d1ae76dcbbb73d8e20c6a14a7d3fe2410b95f55
Component: engine
2017-06-23 22:52:02 -07:00
8e27989c88
Merge pull request #33707 from Syntaxide/s3fix
...
Fix authorization header handling in downloader script.
Upstream-commit: d75eb735eee26521b76c732f8b07cfaf6c460d12
Component: engine
2017-06-23 20:27:54 -07:00
8065c10b0c
Merge pull request #33698 from cpuguy83/dm_deferred_delete_default
...
Enable dm deferred_* with version check
Upstream-commit: 5b54e78947a5ab8b4c9e60179b205a82227944e4
Component: engine
2017-06-23 19:30:05 -07:00
