toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,396 Commits 3 Branches 295 Tags
8591aa095636f138c8b699e8519bfab6e6d3fcb4
Commit Graph
38396 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsu 8591aa0956 update moby-extras tool fixes git param 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-09-29 15:17:11 -07:00
Andrew Hsu ae273c63d1 Merge component 'engine' from git@github.com:moby/moby master 2017-09-28 10:34:35 -07:00
Tõnis Tiigi 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
Vincent Demeester 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
Victor Vieux 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
Victor Vieux 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
Eli Uriegas 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Andrew Hsu 747646833d Merge component 'engine' from git@github.com:moby/moby master 2017-09-27 10:25:04 -07:00
Andrew Hsu 915d4f9741 Merge component 'cli' from git@github.com:docker/cli master 2017-09-27 09:23:02 -07:00
Kenfe-Mickaël Laventure 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Vincent Demeester 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
Sebastiaan van Stijn 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
Vincent Demeester 689b8ff233 Merge pull request #562 from dnephin/update-gometalinter 
Update gometalinter
Upstream-commit: feb4d79935
Component: cli
 2017-09-27 09:42:37 +02:00
Vincent Demeester 5a67fa7a37 Merge pull request #563 from riyazdf/remove-extra-options 
trust: remove extraneous OPTIONS from commands that do not use it
Upstream-commit: e27e07a8a9
Component: cli
 2017-09-27 09:41:33 +02:00
Riyaz Faizullabhoy bb1eca37a9 trust: remove extraneous OPTIONS from commands that do not use it 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 9ad0e8f223
Component: cli
 2017-09-26 16:15:45 -07:00
Pradip Dhara 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
Pradip Dhara 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
Sebastiaan van Stijn 23c421f3c5 Merge pull request #557 from allencloud/add-more-event-filter-type 
Add more event filters in doc: config, node, secret and service
Upstream-commit: 62d62ff513
Component: cli
 2017-09-26 22:48:22 +02:00
Sebastiaan van Stijn 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
Andrew Hsu f99bd6dc82 Merge component 'engine' from git@github.com:moby/moby master 2017-09-26 12:50:25 -07:00
Daniel Nephin dead314452 Refactor image commands to make use of the new trust struct for trusted pull 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4203b49431
Component: cli
 2017-09-26 15:15:42 -04:00
Victor Vieux 8a5301f81b Merge pull request #34911 from dnephin/new-ci-entrypoint 
Add a new entrypoint for CI
Upstream-commit: a971f9c9d7d1bdc69b197a82c3fb010681f5cd1f
Component: engine
 2017-09-26 11:50:44 -07:00
Andrew Hsu 1a654751d3 Merge component 'cli' from git@github.com:docker/cli master 2017-09-26 10:56:04 -07:00
Tõnis Tiigi 7fd47ecc0d Merge pull request #34961 from fcrisciani/libnetwork-vendoring 
Vendoring libnetwork
Upstream-commit: 37eb796ccb6de7def92f0ab3f18c686ae92ef29f
Component: engine
 2017-09-26 10:50:32 -07:00
Sebastiaan van Stijn 09b100cab2 Merge pull request #34973 from darrenstahlmsft/fixError 
Fix error string about containers feature
Upstream-commit: 9feef9287474d0e9afe489d9ad0b71a986a012cb
Component: engine
 2017-09-26 18:44:12 +02:00
Sebastiaan van Stijn 6424aeb9fa Merge pull request #34918 from thaJeztah/update-copy-add-error 
Improve error message for COPY missing destination
Upstream-commit: 76b5ab6f43aeffe4261e2b1f848476d36d332880
Component: engine
 2017-09-26 18:43:36 +02:00
Sebastiaan van Stijn 57c6d20473 Merge pull request #34358 from ripcurld0/fix_link_problem 
Add an integration test for bug #31392 regression
Upstream-commit: 584ed9603b4cb79160d0dd8689cdbbdedb9fe00f
Component: engine
 2017-09-26 18:41:08 +02:00
Daniel Nephin f321e1ed9d Update gometalinter 
The update includes bug fixes in gometalinter and updates to linters, which
discovered more linter problems.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d956386b2d
Component: cli
 2017-09-26 12:33:35 -04:00
Allen Sun 2a54e5d16e add node/service/secret/config specific event filter 
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
Upstream-commit: 4611ecd3cdc9b2738f58a136b79f752add223f3f
Component: engine
 2017-09-27 00:23:51 +08:00
Sebastiaan van Stijn e3c3856028 Merge pull request #34908 from thaJeztah/bump-api-version-1.33 
Bump API version to 1.33
Upstream-commit: 74a084162ce544fe995715ba47aa84d3d75b95c1
Component: engine
 2017-09-26 18:09:50 +02:00
Allen Sun 86f10d67d5 add more event filters in doc: config, node, secret and service 
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
Upstream-commit: fc98f8757a
Component: cli
 2017-09-27 00:04:56 +08:00
Sebastiaan van Stijn 399de7ee20 Merge pull request #551 from dnephin/set-local-constant 
Use a local constant
Upstream-commit: 0856c20e04
Component: cli
 2017-09-26 17:42:50 +02:00
Sebastiaan van Stijn 57dd97eab1 Merge pull request #555 from joaofnfernandes/docs/advertise-addr 
Add note about joining through a load balancer
Upstream-commit: b77f3fd5ac
Component: cli
 2017-09-26 17:15:42 +02:00
Sebastiaan van Stijn 671d46ed3d Merge pull request #34983 from thaJeztah/suppress-tmp-rename-warning 
Suppress warning for renaming missing tmp directory
Upstream-commit: 65234597216d03866bc26bdad06cb1f25f832206
Component: engine
 2017-09-26 16:53:28 +02:00
Sebastiaan van Stijn 9e59512fe4 Merge pull request #451 from tych0/use-pass-backend 
Use pass backend
Upstream-commit: be8dab26a3
Component: cli
 2017-09-26 16:40:32 +02:00
Tycho Andersen 1fe51e0bb7 document the pass backend and default behavior 
Also add a big warning about cleartext passwords.

Signed-off-by: Tycho Andersen <tycho@docker.com>
Upstream-commit: a2f116733b
Component: cli
 2017-09-26 08:31:02 -06:00
Sebastiaan van Stijn 5dbfedf3f9 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 065118390a3ecaf0dbd2fa752d54d43f8f1e8ec6,
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>
Upstream-commit: a4efe66cf2a7648dbcf5b9993bf351925b905b5b
Component: engine
 2017-09-26 13:59:45 +02:00
Sebastiaan van Stijn c4c68bf819 Replace uses of filters.Include() with filters.Contains() 
The `filters.Include()` method was deprecated in favor of `filters.Contains()`
in 065118390a3ecaf0dbd2fa752d54d43f8f1e8ec6, 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>
Upstream-commit: 97c5ae25c4d857563acd1f3467afc760145b1d55
Component: engine
 2017-09-26 13:39:56 +02:00
Yong Tang b987e63572 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>
Upstream-commit: e0ff1d147bc12234f1be25a620bf6b3bf3179d97
Component: engine
 2017-09-26 11:07:27 +00:00
Sebastiaan van Stijn cbf8cc6faf 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>
Upstream-commit: 2b50b14aebc12722f81db8d8f66415e1fa7b954a
Component: engine
 2017-09-26 12:04:30 +02:00
Vincent Demeester b4098a4e18 Merge pull request #34968 from chris-crone/integration-test-docker-ee 
Docker EE integration test fixes
Upstream-commit: 147443a42665419d8b3c2047a7d345440bfb63c0
Component: engine
 2017-09-26 10:50:09 +02:00
Vincent Demeester 48757849a4 Merge pull request #34946 from dnephin/fix-jsonlog 
Move pkg/jsonlog to be a subpackage of the single consumer
Upstream-commit: 7d47823c22945bb24a609a7ef20c0559d78d96e4
Component: engine
 2017-09-26 10:49:57 +02:00
Boaz Shuster ec4868350d 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>
Upstream-commit: 48a26ba9e42f25ebc1ad732b4c0d31e77a7aaa55
Component: engine
 2017-09-26 10:55:59 +03:00
Vincent Demeester fa79e0059e Merge pull request #34943 from tonistiigi/vendor-buildkit 
vendor: update buildkit to aaff9d591
Upstream-commit: 4d48baacde3dd6bb9e4c4f8ef1319765ded031f4
Component: engine
 2017-09-26 08:37:46 +02:00
Vincent Demeester 3366e8951a Merge pull request #34965 from vdemeester/fix-pkg-mount-unit-test-under-selinux 
Fix TestMount under a selinux system
Upstream-commit: 41313c87a25aec122fb43fdaf2433d1b121f1808
Component: engine
 2017-09-26 08:37:22 +02:00
yangchenliang 401172966f "docker swarm init --force-new-cluster" use limit 
Signed-off-by: yangchenliang <yangchenliang@huawei.com>

When worker executor `docker swarm init
--force-new-cluster`,docker would hang.So only manager can process it.

Signed-off-by: yangchenliang <yangchenliang@huawei.com>
Upstream-commit: 12e947efdba5481020f6543514ade83d87c69a28
Component: engine
 2017-09-26 12:05:19 +08:00