toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,713 Commits 3 Branches 295 Tags
c87c16c58590260f3e16ef96a26444d84a46753b
Commit Graph
36618 Commits
Author SHA1 Message Date
Andrew HsuandGitHub df7b627909 Merge pull request #282 from andrewhsu/v 
[17.11] bump version to 17.11.0-ce-rc1
 2017-10-30 17:24:29 -07:00
Andrew Hsu 79e752a8a2 skip test DockerSuite.TestRmiImageIDForceWithRunningContainersAndMultipleTags 
This integration-cli test needs to be fixed for change in `rmi -f`
behaviour.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-10-30 15:41:04 -07:00
Andrew Hsu d17cdf8c45 skip test DockerSuite.TestRmiContainerImageNotFound 
Skipping integration-cli test because it should be moved to an API test.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-10-30 15:41:04 -07:00
Andrew Hsu a04fcc11ee skip test DockerSuite.TestCpFromErrDstParentNotExists 
This integration-cli test is only testing CLI behaviour so should not be
in the engine side of tests.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-10-30 15:41:04 -07:00
Andrew HsuandGitHub 19d1dd5c8c Merge pull request #278 from riyazdf/update-tests-for-17.11 
[17.11] update trust tests for 17.11
 2017-10-30 15:36:21 -07:00
Andrew Hsu 2b277deb2a bump version to 17.11.0-ce-rc1 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-10-30 15:04:12 -07:00
Andrew Hsu 7cbbc92838 Merge component 'engine' from git@github.com:moby/moby master 2017-10-30 21:52:27 +00:00
Andrew Hsu b9bd420700 Merge component 'cli' from git@github.com:docker/cli master 2017-10-30 21:32:56 +00:00
Sebastiaan van StijnandGitHub c0bf3ebcc8 Merge pull request #35177 from sargun/add-quota-tests 
Add tests to project quotas and detection mechanism
Upstream-commit: 226eb8004e0e9b1cd55b37ce4c235c0f19ca9a14
Component: engine
 2017-10-30 21:08:38 +01:00
Sebastiaan van StijnandGitHub de8f897ce4 Merge pull request #651 from thaJeztah/fix-extra-host-sorting 
Preserve sort-order of extra hosts, and allow duplicate entries
Upstream-commit: 96b8d15bdd
Component: cli
 2017-10-30 20:38:10 +01:00
Yong TangandGitHub 89f40238db Merge pull request #34888 from jahkeup/sized-logger 
logger: copy to log driver's bufsize, fixes #34887
Upstream-commit: dfc2d62632d32f9d38166ea477f0ca033a5c91c2
Component: engine
 2017-10-30 12:37:41 -07:00
Sebastiaan van StijnandGitHub 2700d23ec3 Merge pull request #35102 from ripcurld0/doc_31926 
Elaborate more about port allocation in docs
Upstream-commit: a6f09a7509cd77b4ce0bf26845a253a7d9997d11
Component: engine
 2017-10-30 20:28:36 +01:00
Eli UriegasandRiyaz Faizullabhoy ec6b0a1a4a Blacklist tests, will be rewritten later on 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 4e81e4fa4e)
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-10-30 19:12:26 +01:00
Brian GoffandGitHub 0e0f534e7d Merge pull request #652 from thaJeztah/move-notary 
Move notary to its new location
Upstream-commit: 7ca234fe24
Component: cli
 2017-10-30 14:05:59 -04:00
Daniel NephinandGitHub 7878df6b36 Merge pull request #655 from eiais/extraQuote 
Remove extra quotes from docker trust sign
Upstream-commit: 65398de1a6
Component: cli
 2017-10-30 13:53:18 -04:00
Daniel NephinandGitHub 7b52a0b8c0 Merge pull request #648 from thaJeztah/fix-host-add-description 
Fix flag description for --host-add
Upstream-commit: a79e742bfc
Component: cli
 2017-10-30 13:52:29 -04:00
Andrew Hsu 17ef49339b Merge component 'cli' from git@github.com:docker/cli master 2017-10-30 17:32:31 +00:00
Kyle Spiers 48cf1a4fab Remove extra quotes from docker trust sign 
Signed-off-by: Kyle Spiers <kyle@spiers.me>
Upstream-commit: 291fdcfdbe
Component: cli
 2017-10-30 10:31:21 -07:00
Riyaz Faizullabhoy 250b84ee88 update integration-cli tests for stderr output 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-10-30 18:24:39 +01:00
Jacob Vallejo bd61323342 logger: copy to log driver's bufsize 
Log drivers may have an internal buffer size that can be accommodated
by the copier as it is more effective to buffer and send fewer though
larger messages that the log driver can consume.

This eliminates the need for Partial handling for drivers that do not
support the concept (ie: awslogs, which can only have events up to
service limits).

Signed-off-by: Jacob Vallejo <jakeev@amazon.com>
Upstream-commit: e1ada0b885b31de0bb0e79b4d99ae4d48b65f721
Component: engine
 2017-10-30 16:25:09 +00:00
Sebastiaan van Stijn 095f04e761 Move notary to its new location 
The https://github.com/docker/notary repository has moved to
https://github.com/theupdateframework/notary

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6cd58063fa
Component: cli
 2017-10-30 17:21:41 +01:00
Sebastiaan van StijnandGitHub dd79157d92 Merge pull request #566 from riyazdf/docker-trust-2 
docker trust: interact with signers and keys
Upstream-commit: 0c4fa699eb
Component: cli
 2017-10-30 17:03:58 +01:00
Andrew Hsu c75c0e3626 Merge component 'engine' from git@github.com:moby/moby master 2017-10-30 16:00:31 +00:00
Riyaz Faizullabhoy 2f9ed9f2a3 review feedback: updating for windows, error paths 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: e189a21a25
Component: cli
 2017-10-30 16:55:59 +01:00
Riyaz Faizullabhoy fb29d9eb55 update to stderr instead of stdout, update tests 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 079471ebeb
Component: cli
 2017-10-30 16:55:59 +01:00
Riyaz Faizullabhoy 80651d6c61 revendor notary for updated import/export packages, update with rebase 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: b4ef2ddb8b
Component: cli
 2017-10-30 16:55:59 +01:00
Riyaz Faizullabhoy aeaef10882 refactoring and adding tests for EC key types 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 2d8cc3cd80
Component: cli
 2017-10-30 16:55:59 +01:00
Riyaz Faizullabhoy 506e33cdf2 trust: move signer and key commands down one level 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 532d223db4
Component: cli
 2017-10-30 16:53:54 +01:00
Kyle SpiersandRiyaz Faizullabhoy 222f56b982 docs: add docs for new trust subcommands 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 4e797eaa04
Component: cli
 2017-10-30 16:53:54 +01:00
Riyaz Faizullabhoy d01ed820ce trust: key-load and key-generate code 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 604bc3f22d
Component: cli
 2017-10-30 16:53:53 +01:00
Ashwini OrugantiandRiyaz Faizullabhoy cfe9deca16 trust: add signer-add and signer-remove command 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: dde9f614a7
Component: cli
 2017-10-30 16:53:53 +01:00
Andrew Hsu a2d940cc8d Merge component 'cli' from git@github.com:docker/cli master 2017-10-30 15:41:05 +00:00
Sebastiaan van StijnandGitHub 88e8779c7d Merge pull request #623 from johndmulhausen/master 
Removing titles from md files
Upstream-commit: 92afc3f474
Component: cli
 2017-10-30 14:01:58 +01:00
Sebastiaan van Stijn c5ffc78d5e Preserve sort-order of extra hosts, and allow duplicate entries 
Extra hosts (`extra_hosts` in compose-file, or `--hosts` in services) adds
custom host/ip mappings to the container's `/etc/hosts`.

The current implementation used a `map[string]string{}` as intermediate
storage, and sorted the results alphabetically when converting to a service-spec.

As a result, duplicate hosts were removed, and order of host/ip mappings was not
preserved (in case the compose-file used a list instead of a map).

According to the **host.conf(5)** man page (http://man7.org/linux/man-pages/man5/host.conf.5.html)

    multi  Valid values are on and off.  If set to on, the resolver
      library will return all valid addresses for a host that
      appears in the /etc/hosts file, instead of only the first.
      This is off by default, as it may cause a substantial
      performance loss at sites with large hosts files.

Multiple entries for a host are allowed, and even required for some situations,
for example, to add mappings for IPv4 and IPv6 addreses for a host, as illustrated
by the example hosts file in the **hosts(5)** man page (http://man7.org/linux/man-pages/man5/hosts.5.html):

    # The following lines are desirable for IPv4 capable hosts
    127.0.0.1       localhost

    # 127.0.1.1 is often used for the FQDN of the machine
    127.0.1.1       thishost.mydomain.org  thishost
    192.168.1.10    foo.mydomain.org       foo
    192.168.1.13    bar.mydomain.org       bar
    146.82.138.7    master.debian.org      master
    209.237.226.90  www.opensource.org

    # The following lines are desirable for IPv6 capable hosts
    ::1             localhost ip6-localhost ip6-loopback
    ff02::1         ip6-allnodes
    ff02::2         ip6-allrouters

This patch changes the intermediate storage format to use a `[]string`, and only
sorts entries if the input format in the compose file is a mapping. If the input
format is a list, the original sort-order is preserved.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dbdf8f6468
Component: cli
 2017-10-30 01:48:09 +01:00
Sebastiaan van StijnandGitHub 3090f62b5d Merge pull request #35313 from charrywanganthony/RandomAlpha 
Separate the GenerateRandomAlphaOnlyString function from stringutils
Upstream-commit: ba3bf8191e3390745420ada6b7f79483eb7e7be0
Component: engine
 2017-10-29 22:33:57 +01:00
Yong TangandGitHub b3821c58fe Merge pull request #34999 from kolyshkin/wait-on-rm 
ContainerWait on remove: don't stuck on rm fail
Upstream-commit: 220d6c4aff7e3c8887f8c39e8f47b4aca21ab22f
Component: engine
 2017-10-29 11:04:41 -07:00
Yong TangandGitHub a313f92089 Merge pull request #35289 from zuiurs/namesgeneratorCmd 
Fix a names-generator binary
Upstream-commit: e8730d052e625af3666176f7c1f596bb07fccbe2
Component: engine
 2017-10-28 13:16:33 -07:00
Yong TangandGitHub 6a734a478e Merge pull request #35314 from thaJeztah/improve-devicemapper-info 
Improve devicemapper driver-status output
Upstream-commit: 1f5bcb1b8812abd832fee3721dd29ef431ddc32a
Component: engine
 2017-10-28 11:15:59 -07:00
Sebastiaan van Stijn 772cdcbf0c Fix flag description for --host-add 
The `--host-add` flag adds a new `host:ip` mapping. Even though
adding an entry is idempotent (adding the same mapping multiple
times does not update the service's definition), it does not
_update_  an existing mapping with a new IP-address (multiple
IP-addresses can be defined for a host).

This patch removes the "or update" part from the flag's
description.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 79b19cba16
Component: cli
 2017-10-28 16:47:53 +02:00
chaowang be3cbac37e Separate the GenerateRandomAlphaOnlyString function from stringutils 
Signed-off-by: chaowang <chaowang@localhost.localdomain>
Upstream-commit: 7c35a2418265336a572976e2ced378ef4b6f1666
Component: engine
 2017-10-28 09:03:02 +08:00
Sebastiaan van StijnandGitHub a4aced17f9 Merge pull request #646 from jadametz/add_unpause_output 
Adds unpause output to docs
Upstream-commit: 7ed96d3b2b
Component: cli
 2017-10-28 02:00:40 +02:00
Kenfe-Mickaël LaventureandGitHub 4e5eea8827 Merge pull request #35320 from Microsoft/jjh/lcow-set-oci-root 
Fixes LCOW after containerd 1.0 introduced regressions
Upstream-commit: 2613c3d53cee46d8e0dc8e1aba83686f259985e4
Component: engine
 2017-10-28 09:02:00 +11:00
Andrew Hsu e947e4d4f1 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-10-27 11:27:43 -07:00
Andrew Hsu fdcaaa2daa Merge component 'engine' from git@github.com:moby/moby master 2017-10-27 11:27:30 -07:00
Sargun Dhillon 320e3a6526 Add tests to project quotas and detection mechanism 
This adds a mechanism (read-only) to check for project quota support
in a standard way. This mechanism is leveraged by the tests, which
test for the following:
 1. Can we get a quota controller?
 2. Can we set the quota for a particular directory?
 3. Is the quota being over-enforced?
 4. Is the quota being under-enforced?
 5. Can we retrieve the quota?

Signed-off-by: Sargun Dhillon <sargun@sargun.me>
Upstream-commit: 6966dc0aa9134c518babcbf1f02684cae5374843
Component: engine
 2017-10-27 11:07:37 -07:00
Andrew Hsu ac1bfe09d7 Merge component 'cli' from git@github.com:docker/cli master 2017-10-27 10:23:42 -07:00
John Howard 67f37f6e34 Fixes LCOW after containerd 1.0 introduced regressions 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 71651e0b801ae874b4a899e3c47add9e3fbc2400
Component: engine
 2017-10-27 09:55:43 -07:00
Daniel NephinandGitHub b829f463d9 Merge pull request #636 from dnephin/fix-trust-output-stream 
Fix stdout and errors in image/trust
Upstream-commit: 54e1378e04
Component: cli
 2017-10-27 11:31:01 -04:00
Sebastiaan van StijnandGitHub ab4fa07bf0 Merge pull request #621 from charrywanganthony/displaystringutils 
Refactor stringutils and fix docker search output form
Upstream-commit: e4940cb8d2
Component: cli
 2017-10-27 11:08:36 +02:00
Sebastiaan van StijnandGitHub 4251785d24 Merge pull request #645 from dnephin/use-upstream-spf13-cobra 
Hide help flag from help output
Upstream-commit: 6aedafd195
Component: cli
 2017-10-27 11:00:07 +02:00