aba7eac9a8
Merge pull request #35085 from thaJeztah/update-portconfig-swagger
...
Add PortConfig.PublishMode to API documentation
Upstream-commit: f0e393bd0a3064aa72e7aebe2308d518c8fce676
Component: engine
2017-10-05 11:15:17 -07:00
87d82fc493
Merge pull request #35087 from corbin-coleman/fix-integration-stats-test
...
Fix One of the Docker Stats Tests in /integration-cli
Upstream-commit: ed082152f6e7c6c7c7fbf2bc777ba1ae88cb9073
Component: engine
2017-10-05 17:59:53 +02:00
bf9a49688b
Merge pull request #35084 from thaJeztah/update-authors
...
Update mailmap and authors
Upstream-commit: a437b078d33bc4284de80be842d0ee9e5c8a18af
Component: engine
2017-10-05 12:21:34 +02:00
b69e823a30
Merge pull request #35056 from tklauser/win-console-mode-consts
...
Use windows console mode constants from Azure/go-ansiterm
Upstream-commit: 1c4fad8135b52a8a6405aef897712c4ca7a6d168
Component: engine
2017-10-05 00:41:22 +02:00
d29f681cdb
Use the first 12 characters of the ID to match the output of docker stats command
...
Signed-off-by: Corbin <corbin.coleman@docker.com >
Upstream-commit: 8c10098ea51017fb514bef5c31a310a3f2d0d411
Component: engine
2017-10-04 13:43:00 -07:00
c1d495468d
Add PortConfig.PublishMode to API documentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fd90733972c6e78a0871b068e01e29ae1ac97fd7
Component: engine
2017-10-04 15:34:08 +02:00
27685bd51b
Update mailmap and authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4309d3cf6b12fb7e9c5f23b756aed33f6dd74d1e
Component: engine
2017-10-04 14:44:24 +02:00
7bcc658be1
Merge pull request #35072 from tophj-ibm/fix-kernel-version-detection
...
[integration-cli] fix s390x flaky test
Upstream-commit: d65ab869e8712d08fb94a5337b83df5d247bf25b
Component: engine
2017-10-03 23:46:10 +02:00
c75056fadb
[integration-cli] fix s390x flaky test
...
s390x node-1 has kernel 4.6.0, kernel.CompareKernelVersion()
returns 0 if the kernels are equal, so include that.
Full logic for CompareKernelVersion() is
a > b ret 1,
a == b ret 0,
a < b ret -1
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: aa5ea652c8864f014e1fa480d7e504f0d742c170
Component: engine
2017-10-03 12:13:29 -04:00
b11186b8f9
Merge pull request #34342 from coolljt0725/fallback_to_naive_diff
...
Fallback to use naive diff driver if enable CONFIG_OVERLAY_FS_REDIRECT_DIR
Upstream-commit: 595b929c573236dd95111429039f7f0788c1a7e5
Component: engine
2017-10-03 06:45:17 -07:00
233679b950
Merge pull request #35069 from thaJeztah/remove-deprecated-error-check
...
Remove deprecated error checks
Upstream-commit: 882563b2d64a99f24923c4b2bfe90750f2fdd433
Component: engine
2017-10-03 06:40:47 -07:00
72747182f4
Remove deprecated IsErr...NotFound() functions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7553fc4bcd80d103096f2e8f662b7fb3c65b5249
Component: engine
2017-10-03 12:07:49 +02:00
886e433681
Replace uses of deprecated IsErr...Notfound()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 919726b5dbf7f063f82eac2f5384966fc7271710
Component: engine
2017-10-03 12:05:03 +02:00
1941c5110e
Merge pull request #35063 from LK4D4/locker_benchmarks
...
pkg/locker: add benchmarks
Upstream-commit: a8e7aca3fd2aeefa24b3f1a039f8c63b0301cacf
Component: engine
2017-10-03 09:45:56 +02:00
d35ee25d03
pkg/locker: add benchmarks
...
Signed-off-by: Alexander Morozov <lk4d4math@gmail.com >
Upstream-commit: 889cfd1b441e8039bb6b78e8c54276b8eb03cdef
Component: engine
2017-10-02 11:20:21 -07:00
46c885c3e3
Use all console mode constants from go-ansiterm
...
The missing console mode constants were added to go-ansiterm in
Azure/go-ansiterm#23 . Use these constants instead of defining them
locally.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch >
Upstream-commit: 9335683fa50c4863ada4bf00a30e7dfbfef3c783
Component: engine
2017-10-02 09:49:20 +02:00
81273ccd92
vendor: re-vendor github.com/Azure/go-ansiterm
...
Re-vendor go-ansiterm to d6e3b3328b783f23731bc4d058875b0371ff8109 in
order to get the newly added console mode constants.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch >
Upstream-commit: 2b946fbc7012eff745e23aa43672f4ce4c5208a6
Component: engine
2017-10-02 09:47:38 +02:00
5f36dc5666
Merge pull request #35052 from x1957/typo
...
fix typo
Upstream-commit: 1e94a4862ee2d92976c26ff741585d090169ed42
Component: engine
2017-10-01 15:31:11 -04:00
cfbb3b1158
Merge pull request #34874 from pascalgn/patch-1
...
Reworded push message
Upstream-commit: 4a244c3558ab6985ba110d261920b575016fd2d4
Component: engine
2017-10-01 10:29:43 -07:00
76886c96d8
fix typo
...
Signed-off-by: Yuhao Fang <fangyuhao@gmail.com >
Upstream-commit: c673319dea5adcb33379b13f8e70c1d157e7c87d
Component: engine
2017-10-01 23:11:58 +08:00
ae4be632f1
Merge pull request #35045 from thaJeztah/bump-tonistiigi-fsutil
...
vendor tonistiigi/fsutil to dea3a0da73aee887fc02142d995be764106ac5e2
Upstream-commit: 9c9f4d6f70a14e00902cae19dd586a6faa6476f6
Component: engine
2017-09-30 13:23:30 -07:00
4e99cb1e84
vendor tonistiigi/fsutil to dea3a0da73aee887fc02142d995be764106ac5e2
...
removes the stevvooe/continuity dependency, which has moved to
containerd/continuity.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e3c130df944bc433efe7bc5bddebbb1ac0f35d93
Component: engine
2017-09-30 18:04:11 +02:00
b123db0bdc
Merge pull request #35044 from thaJeztah/bump-api-version-1.34
...
Bump API version to 1.34
Upstream-commit: 19015df2b06769a0908ba9eeae72d9b785684ed3
Component: engine
2017-09-29 22:20:30 -10:00
4b6bbc7c4a
Merge pull request #35040 from thaJeztah/bump-vndr
...
Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
Upstream-commit: e223bbedc127b7260ac2c8702cbd8e41d764b4d1
Component: engine
2017-09-29 16:48:52 -10:00
6e3b4640d2
Bump API version to 1.34
...
Docker 17.10 was cut off from ab2b03a0e139537376bbf66c1e1e9e897a403f06
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 288abf0854852b4542da359400b3c29e99941fc9
Component: engine
2017-09-30 01:13:20 +02:00
4c4e74cebe
Merge pull request #35042 from pradipd/panic_fix
...
Fixing panic when sandbox is nil
Upstream-commit: ab2b03a0e139537376bbf66c1e1e9e897a403f06
Component: engine
2017-09-29 12:51:55 -07:00
28e35b96d0
Fixing panic when sandbox is nil
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: c4ad0747e929a41ecec7e8c2ae2bd0cc037401ed
Component: engine
2017-09-29 09:23:06 -07:00
a2cd96f46a
Reworded push message
...
Changed push message from "The push refers to a repository" to "The push refers to the repository" to make it clearer that this is just an information about the local source and not a distinction between pushing single images or whole repositories.
Signed-off-by: Pascal <pascalgn@users.noreply.github.com >
Upstream-commit: d82948b75d8aba97816ff5257240c1edb5e8de5b
Component: engine
2017-09-29 17:02:20 +02:00
bf69bcbb74
Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
...
Includes a fix to cleanup unused vendor-directories
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 67b1f54dc2413a018ac42e4335ca182a2d0b8a1d
Component: engine
2017-09-29 15:09:57 +02:00
907b966c7e
Merge pull request #35029 from fntlnz/builder/cleaning
...
Cleaning dead code out of the builder
Upstream-commit: de6cb7ab848d6131634e40d21d30bf2fe183e9a3
Component: engine
2017-09-29 16:28:02 +09:00
4034b44eca
Cleaning dead code out of the builder
...
Signed-off-by: Lorenzo Fontana <lo@linux.com >
Upstream-commit: dff2a23749a6b7c949146d7850f514cd74e3a8d7
Component: engine
2017-09-29 02:55:35 +02:00
80c3ad8db1
Merge pull request #35008 from yujuhong/cli-version
...
Fix version comparison when negotiating the the API version
Upstream-commit: 14ce1f1cf48e9859223c6311de58aec4dc0f046c
Component: engine
2017-09-28 11:58:50 -10:00
d62e09de17
Merge pull request #35025 from Microsoft/jjh/TestRunAttachFailedNoLeak
...
Windows: RS3: Temporarily disable TestRunAttachFailedNoLeak
Upstream-commit: 048ef0db6a75898aee57bf725ed64940744cd938
Component: engine
2017-09-28 21:59:32 +02:00
4330196b5a
Windows: RS3: Temporarily disable TestRunAttachFailedNoLeak
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9e587fa72b8cc42895681efe3d0b9fdcdfe3b06d
Component: engine
2017-09-28 10:15:58 -07:00
e25514ef0c
Merge pull request #35004 from thaJeztah/dont-warn-for-comment-only-lines
...
Warn on empty continuation lines only, not on comment-only lines
Upstream-commit: 94b987043ffd372aad49dfc51c3be2c2f6cff97f
Component: engine
2017-09-28 08:56:30 -07:00
d6eb3e21a4
Merge pull request #35007 from seemethere/fix_service_detach_tests
...
Explicitly add --detach to service CLI calls
Upstream-commit: 5a4841079bc247937e6ed1042ab24ffd01a8547c
Component: engine
2017-09-28 11:17:14 +02:00
747a47b477
Fix version comparison when negotiating the the API version
...
Signed-off-by: Yu-Ju Hong <yjhong@google.com >
Upstream-commit: 4b6ec10b07c14e7fff1cc51156b6d954147f826f
Component: engine
2017-09-27 18:42:02 -07:00
d7aeee3eda
remove --detach on scale
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 0ad0294124badebe0d9a73f1b7e2f030e4a24e2b
Component: engine
2017-09-27 17:47:51 -07:00
8d23cb5213
Merge pull request #34966 from AkihiroSuda/seccomp
...
Dockerfile: use seccomp provided by stretch
Upstream-commit: aa02e2b7bc1f5f4b921f64337e4f6d1cf7aa8fe4
Component: engine
2017-09-27 16:21:55 -07:00
ca5a5c5ca1
Explicitly add --detach to service CLI calls
...
The behavior of service (create/update/scale) was changed in a recent PR
to docker/cli. This commit serves to remedy test failures experienced
when attempting to use service calls.
Should not affect current behavior.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: e5b3ebbc649e4b1a10d4cdca342a153c301ec225
Component: engine
2017-09-27 16:17:55 -07:00
f6d296e26e
Warn on empty continuation lines only, not for comments
...
Commit 8d1ae76dcbbb73d8e20c6a14a7d3fe2410b95f55 added
deprecation warnings for empty continuation lines,
but also treated comment-only lines as empty.
This patch distinguishes empty continuation lines
from comment-only lines, and only outputs warnings
for the former.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2fd736ac10c1c46d1001373d887cb99b3d8ee824
Component: engine
2017-09-28 00:11:10 +02:00
00bb761ead
Merge pull request #34990 from pradipd/update_field_name
...
Update field name
Upstream-commit: 853df8f32bf560428fdc39dfd9bfa7bb7c610346
Component: engine
2017-09-27 20:00:18 +02:00
4d03073a2c
Merge pull request #34811 from yongtang/runc
...
Update runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d
Upstream-commit: 502eddb9859dcd30ce46732b24cefe49cf1ccbd1
Component: engine
2017-09-27 08:44:43 -07:00
d14643fb47
Merge pull request #34792 from runcom/fix-relabel-symlinks
...
volume: evaluate symlinks before relabeling mount source
Upstream-commit: f60e7aac62a14907132aa5c3bc9d5cf5ca0e6ebc
Component: engine
2017-09-27 17:42:23 +02:00
240408899b
Merge pull request #34928 from darrenstahlmsft/HnsRunning
...
Ensure Host Network Service exists
Upstream-commit: 6af60b3c6180817e06ce87d562643b442a866502
Component: engine
2017-09-27 17:35:08 +02:00
4262667057
Merge pull request #34985 from thaJeztah/remove-use-of-deprecated-filter-functions
...
Remove use of deprecated filter functions
Upstream-commit: a343cba40c25deb2893e13f9a81dbcc4d19d16e2
Component: engine
2017-09-27 17:34:07 +02:00
7ed1303eb4
Merge pull request #34881 from ityangchen/test-moby
...
"docker swarm init --force-new-cluster" use limit
Upstream-commit: 0b968f91958eea12c2fa82cec64790cb03367232
Component: engine
2017-09-27 14:11:46 +02:00
e4f32567d3
Updating moby to correspond to naming convention used in https://github.com/docker/swarmkit/pull/2385
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: d00a07b1e6d46c3cc9ef95e8b6227115830e2701
Component: engine
2017-09-26 22:08:10 +00:00
fa385958f4
vndr swarmkit 941a01844b89c56aa61086fecb167ab3af1de22b
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 8e15b1cffb95d1e82943a628353c6df7cd54f6c4
Component: engine
2017-09-26 22:08:10 +00:00
de74f6b50c
Merge pull request #34952 from allencloud/add-specific-event-filter
...
add node/service/secret/config specific event filter
Upstream-commit: afe31900915782daf67b40d405d8e7b8e01ab2dd
Component: engine
2017-09-26 22:46:41 +02:00
