Doug Davis
1e94a4862e
Merge pull request #35052 from x1957/typo
...
fix typo
2017-10-01 15:31:11 -04:00
Yong Tang
4a244c3558
Merge pull request #34874 from pascalgn/patch-1
...
Reworded push message
2017-10-01 10:29:43 -07:00
Yuhao Fang
c673319dea
fix typo
...
Signed-off-by: Yuhao Fang <fangyuhao@gmail.com>
2017-10-01 23:11:58 +08:00
Yong Tang
9c9f4d6f70
Merge pull request #35045 from thaJeztah/bump-tonistiigi-fsutil
...
vendor tonistiigi/fsutil to dea3a0da73aee887fc02142d995be764106ac5e2
2017-09-30 13:23:30 -07:00
Sebastiaan van Stijn
e3c130df94
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>
2017-09-30 18:04:11 +02:00
Yong Tang
19015df2b0
Merge pull request #35044 from thaJeztah/bump-api-version-1.34
...
Bump API version to 1.34
2017-09-29 22:20:30 -10:00
Yong Tang
e223bbedc1
Merge pull request #35040 from thaJeztah/bump-vndr
...
Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
2017-09-29 16:48:52 -10:00
Sebastiaan van Stijn
288abf0854
Bump API version to 1.34
...
Docker 17.10 was cut off from ab2b03a0e1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-30 01:13:20 +02:00
Tõnis Tiigi
ab2b03a0e1
Merge pull request #35042 from pradipd/panic_fix
...
Fixing panic when sandbox is nil
2017-09-29 12:51:55 -07:00
Pradip Dhara
c4ad0747e9
Fixing panic when sandbox is nil
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2017-09-29 09:23:06 -07:00
Pascal
d82948b75d
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>
2017-09-29 17:02:20 +02:00
Sebastiaan van Stijn
67b1f54dc2
Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
...
Includes a fix to cleanup unused vendor-directories
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-29 15:09:57 +02:00
Akihiro Suda
de6cb7ab84
Merge pull request #35029 from fntlnz/builder/cleaning
...
Cleaning dead code out of the builder
2017-09-29 16:28:02 +09:00
Lorenzo Fontana
dff2a23749
Cleaning dead code out of the builder
...
Signed-off-by: Lorenzo Fontana <lo@linux.com>
2017-09-29 02:55:35 +02:00
Yong Tang
14ce1f1cf4
Merge pull request #35008 from yujuhong/cli-version
...
Fix version comparison when negotiating the the API version
2017-09-28 11:58:50 -10:00
Sebastiaan van Stijn
048ef0db6a
Merge pull request #35025 from Microsoft/jjh/TestRunAttachFailedNoLeak
...
Windows: RS3: Temporarily disable TestRunAttachFailedNoLeak
2017-09-28 21:59:32 +02:00
John Howard
9e587fa72b
Windows: RS3: Temporarily disable TestRunAttachFailedNoLeak
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-09-28 10:15:58 -07:00
Tõnis Tiigi
94b987043f
Merge pull request #35004 from thaJeztah/dont-warn-for-comment-only-lines
...
Warn on empty continuation lines only, not on comment-only lines
2017-09-28 08:56:30 -07:00
Vincent Demeester
5a4841079b
Merge pull request #35007 from seemethere/fix_service_detach_tests
...
Explicitly add --detach to service CLI calls
2017-09-28 11:17:14 +02:00
Yu-Ju Hong
4b6ec10b07
Fix version comparison when negotiating the the API version
...
Signed-off-by: Yu-Ju Hong <yjhong@google.com>
2017-09-27 18:42:02 -07:00
Victor Vieux
0ad0294124
remove --detach on scale
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-09-27 17:47:51 -07:00
Victor Vieux
aa02e2b7bc
Merge pull request #34966 from AkihiroSuda/seccomp
...
Dockerfile: use seccomp provided by stretch
2017-09-27 16:21:55 -07:00
Eli Uriegas
e5b3ebbc64
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>
2017-09-27 16:17:55 -07:00
Sebastiaan van Stijn
2fd736ac10
Warn on empty continuation lines only, not for comments
...
Commit 8d1ae76dcb
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>
2017-09-28 00:11:10 +02:00
Sebastiaan van Stijn
853df8f32b
Merge pull request #34990 from pradipd/update_field_name
...
Update field name
2017-09-27 20:00:18 +02:00
Kenfe-Mickaël Laventure
502eddb985
Merge pull request #34811 from yongtang/runc
...
Update runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d
2017-09-27 08:44:43 -07:00
Sebastiaan van Stijn
f60e7aac62
Merge pull request #34792 from runcom/fix-relabel-symlinks
...
volume: evaluate symlinks before relabeling mount source
2017-09-27 17:42:23 +02:00
Sebastiaan van Stijn
6af60b3c61
Merge pull request #34928 from darrenstahlmsft/HnsRunning
...
Ensure Host Network Service exists
2017-09-27 17:35:08 +02:00
Vincent Demeester
a343cba40c
Merge pull request #34985 from thaJeztah/remove-use-of-deprecated-filter-functions
...
Remove use of deprecated filter functions
2017-09-27 17:34:07 +02:00
Sebastiaan van Stijn
0b968f9195
Merge pull request #34881 from ityangchen/test-moby
...
"docker swarm init --force-new-cluster" use limit
2017-09-27 14:11:46 +02:00
Danyal Khaliq
00c0ee885c
Increase Coverage of pkg/idtools
...
Signed-off-by: Danyal Khaliq <danyal.khaliq@tenpearls.com>
2017-09-27 12:55:04 +05:00
Pradip Dhara
d00a07b1e6
Updating moby to correspond to naming convention used in https://github.com/docker/swarmkit/pull/2385
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2017-09-26 22:08:10 +00:00
Pradip Dhara
8e15b1cffb
vndr swarmkit 941a01844b89c56aa61086fecb167ab3af1de22b
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2017-09-26 22:08:10 +00:00
Sebastiaan van Stijn
afe3190091
Merge pull request #34952 from allencloud/add-specific-event-filter
...
add node/service/secret/config specific event filter
2017-09-26 22:46:41 +02:00
Victor Vieux
a971f9c9d7
Merge pull request #34911 from dnephin/new-ci-entrypoint
...
Add a new entrypoint for CI
2017-09-26 11:50:44 -07:00
Tõnis Tiigi
37eb796ccb
Merge pull request #34961 from fcrisciani/libnetwork-vendoring
...
Vendoring libnetwork
2017-09-26 10:50:32 -07:00
Sebastiaan van Stijn
9feef92874
Merge pull request #34973 from darrenstahlmsft/fixError
...
Fix error string about containers feature
2017-09-26 18:44:12 +02:00
Sebastiaan van Stijn
76b5ab6f43
Merge pull request #34918 from thaJeztah/update-copy-add-error
...
Improve error message for COPY missing destination
2017-09-26 18:43:36 +02:00
Sebastiaan van Stijn
584ed9603b
Merge pull request #34358 from ripcurld0/fix_link_problem
...
Add an integration test for bug #31392 regression
2017-09-26 18:41:08 +02:00
Allen Sun
4611ecd3cd
add node/service/secret/config specific event filter
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
2017-09-27 00:23:51 +08:00
Sebastiaan van Stijn
74a084162c
Merge pull request #34908 from thaJeztah/bump-api-version-1.33
...
Bump API version to 1.33
2017-09-26 18:09:50 +02:00
Sebastiaan van Stijn
6523459721
Merge pull request #34983 from thaJeztah/suppress-tmp-rename-warning
...
Suppress warning for renaming missing tmp directory
2017-09-26 16:53:28 +02:00
Sebastiaan van Stijn
a4efe66cf2
Replace uses of filters.ToParam(), FromParam() with filters.ToJSON(), FromJSON()
...
`filters.ToParam()` and `filters.FromParam()` were deprecated in favor of
`filters.ToJSON()` and `filters.FromJSON()` in 065118390a
,
but still used in various locations.
This patch replaces uses of `filters.ToParam()` and `filters.FromParam()` with
`filters.ToJSON()` and `filters.FromJSON()`.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-26 13:59:45 +02:00
Sebastiaan van Stijn
97c5ae25c4
Replace uses of filters.Include() with filters.Contains()
...
The `filters.Include()` method was deprecated in favor of `filters.Contains()`
in 065118390a
, but still used in various
locations.
This patch replaces uses of `filters.Include()` with `filters.Contains()`.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-26 13:39:56 +02:00
Yong Tang
e0ff1d147b
Update runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d
...
This fix updates runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d
With this fix the warnings generated by netgo and dlopen by go 1.9
are addressed.
See
- opencontainers/runc#1577
- opencontainers/runc#1579
This fix is part of the efforts for go 1.9 (#33892 )
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-09-26 11:07:27 +00:00
Sebastiaan van Stijn
2b50b14aeb
Suppress warning for renaming missing tmp directory
...
When starting `dockerd` on a host that has no `/var/lib/docker/tmp` directory,
a warning was printed in the logs:
$ dockerd --data-root=/no-such-directory
...
WARN[2017-09-26T09:37:00.045153377Z] failed to rename /no-such-directory/tmp for background deletion: rename /no-such-directory/tmp /no-such-directory/tmp-old: no such file or directory. Deleting synchronously
Although harmless, the warning does not show any useful information, so can be
skipped.
This patch checks thetype of error, so that warning is not printed.
Other errors will still show up:
$ touch /i-am-a-file
$ dockerd --data-root=/i-am-a-file
Unable to get the full path to root (/i-am-a-file): canonical path points to a file '/i-am-a-file'
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-26 12:04:30 +02:00
Vincent Demeester
147443a426
Merge pull request #34968 from chris-crone/integration-test-docker-ee
...
Docker EE integration test fixes
2017-09-26 10:50:09 +02:00
Vincent Demeester
7d47823c22
Merge pull request #34946 from dnephin/fix-jsonlog
...
Move pkg/jsonlog to be a subpackage of the single consumer
2017-09-26 10:49:57 +02:00
Boaz Shuster
48a26ba9e4
Add an integration test for bug #31392 regression
...
This verifies that bug #31392 won't surface again.
To reproduce the bug:
1) docker run -dit --name a0 busybox sh
2) docker run -dit --name b0 --link a0 busybox sh
3) docker rename a0 a1
4) docker run -dit --name a0 busybox sh
5) docker rm -f b0
6) docker run -dit --name b0 --link a0 busybox sh
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-09-26 10:55:59 +03:00
Vincent Demeester
4d48baacde
Merge pull request #34943 from tonistiigi/vendor-buildkit
...
vendor: update buildkit to aaff9d591
2017-09-26 08:37:46 +02:00