66527d3a87
Adding note about creating Windows users
...
Signed-off-by: Patrick Lang <plang@microsoft.com >
Upstream-commit: cc35724c17
2017-11-13 11:43:38 -08:00
2ee46bd08b
Merge pull request #685 from eiais/e2e
...
docker trust sign: add e2e testing
Upstream-commit: 365c525fab
2017-11-13 17:31:42 +01:00
7cf0bd287e
Fix grammar
...
Signed-off-by: Mikhail Vasin <michaelvasin@gmail.com >
Upstream-commit: bdd1b1e279
2017-11-11 16:15:15 +03:00
f5ae1accb6
Add e2e testing for docker trust sign
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: eb025800bd
2017-11-10 14:26:11 -08:00
75f89d26b4
sign test: fix imports
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: a570e9b355
2017-11-10 11:34:04 -08:00
d77f572b3a
Remove extra spaces from service creation examples
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 80211acee9
2017-11-10 10:14:56 -08:00
8a571d7e05
Bump moby to f4d4f5863156b82ef146b6ff1e845f8dcf019f12
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5735fff6fc
2017-11-08 17:50:58 +01:00
edb2c3c5b1
Merge pull request #575 from eiais/local-flag
...
trust sign: add --local flag
Upstream-commit: ee0615dc97
2017-11-07 14:15:53 -05:00
22f416c376
Merge pull request #670 from dnephin/cleanup-compose-volume-name
...
Only warn on volume.external.name for version 3.4
Upstream-commit: 025f51ca93
2017-11-07 14:29:22 +01:00
ce8d7a3b24
Merge pull request #474 from jhowardmsft/jjh/apis-for-platform
...
LCOW: CLI changes to add platform flag - pull, run, create and build
Upstream-commit: 042575aac9
2017-11-07 14:26:31 +01:00
9302e76682
Merge pull request #657 from dnephin/add-test-for-container-cp
...
Adding unit tests for container cp
Upstream-commit: 21d88629df
2017-11-07 14:22:22 +01:00
127d797434
Only warn on volume.external.name for version 3.4
...
Also remove use of volume.external.name
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: aea9544db5
2017-11-06 17:04:36 -05:00
fd4c48b1d3
Update Misty's GitHub handle
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 14b1535dfe
2017-11-02 16:50:38 +01:00
31ecf1d5a7
Merge pull request #661 from thaJeztah/bump-golang-to-1.8.5
...
Bump Go to 1.8.5
Upstream-commit: 5a4fe7fe05
2017-10-31 16:24:27 -04:00
dbab169d62
Bump Go to 1.8.5
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bc8282a235
2017-10-31 21:04:59 +01:00
77f73751db
LCOW: Add --platform= CLI flag to pull/create/run/build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
This is the CLI updates for the document discussed in https://github.com/moby/moby/issues/34617
to support Linux Containers on Windows. It adds --platform= as CLI flags to the four
commands listed above. Import still to be completed (needs daemon changes).
Upstream-commit: d8b782560e
2017-10-31 09:50:43 -07:00
bf8eb18312
Merge pull request #660 from thaJeztah/bump-version-to-v17.12-dev
...
Bump version to 17.12.0-dev
Upstream-commit: 1dc89aa98f
2017-10-31 16:37:42 +01:00
06a81bf15d
Merge pull request #658 from arehman199/fix-a-number-of-typos
...
fix a number of minor typos
Upstream-commit: a0140b4ddb
2017-10-31 15:07:51 +01:00
356175fe57
Bump version to 17.12.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a195685bac
2017-10-31 12:33:06 +01:00
379ed62f4b
Merge pull request #609 from albers/completion-trust
...
Add bash completion for `docker trust` commands
Upstream-commit: d0197347ea
2017-10-31 11:24:35 +01:00
70aedb437f
fix a number of minor typos
...
Fix 19 typos, grammatical errors and duplicated words.
These fixes have minimal impact on the code as these are either in the
doc files or in comments inside the code files.
Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com >
Upstream-commit: c3fe9d85ef
2017-10-31 15:21:51 +05:00
f85a09c5e7
Merge pull request #654 from dnephin/pr-fix-image-rm
...
Fix behaviour of `rmi -f` with unexpected errors
Upstream-commit: 6e04da39b8
2017-10-31 10:38:38 +01:00
57801c5154
trust sign: add --local flag
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: f5a50650d6
2017-10-30 16:06:03 -07:00
b96759ddb9
Adding unit tests for cp
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b7b62ca26a
2017-10-30 18:33:28 -04:00
de8f897ce4
Merge pull request #651 from thaJeztah/fix-extra-host-sorting
...
Preserve sort-order of extra hosts, and allow duplicate entries
Upstream-commit: 96b8d15bdd
2017-10-30 20:38:10 +01:00
0e0f534e7d
Merge pull request #652 from thaJeztah/move-notary
...
Move notary to its new location
Upstream-commit: 7ca234fe24
2017-10-30 14:05:59 -04:00
7878df6b36
Merge pull request #655 from eiais/extraQuote
...
Remove extra quotes from docker trust sign
Upstream-commit: 65398de1a6
2017-10-30 13:53:18 -04:00
7b52a0b8c0
Merge pull request #648 from thaJeztah/fix-host-add-description
...
Fix flag description for --host-add
Upstream-commit: a79e742bfc
2017-10-30 13:52:29 -04:00
48cf1a4fab
Remove extra quotes from docker trust sign
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 291fdcfdbe
2017-10-30 10:31:21 -07:00
74cd535226
Use t.Run() for tests
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b900676523
2017-10-30 13:00:03 -04:00
0f02c6fd5a
docker rm -f exits with 1 if the image was not removed
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 125302cfa6
2017-10-30 12:50:19 -04:00
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
2017-10-30 17:21:41 +01:00
dd79157d92
Merge pull request #566 from riyazdf/docker-trust-2
...
docker trust: interact with signers and keys
Upstream-commit: 0c4fa699eb
2017-10-30 17:03:58 +01:00
2f9ed9f2a3
review feedback: updating for windows, error paths
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: e189a21a25
2017-10-30 16:55:59 +01:00
fb29d9eb55
update to stderr instead of stdout, update tests
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 079471ebeb
2017-10-30 16:55:59 +01:00
80651d6c61
revendor notary for updated import/export packages, update with rebase
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: b4ef2ddb8b
2017-10-30 16:55:59 +01:00
aeaef10882
refactoring and adding tests for EC key types
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 2d8cc3cd80
2017-10-30 16:55:59 +01:00
506e33cdf2
trust: move signer and key commands down one level
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 532d223db4
2017-10-30 16:53:54 +01:00
222f56b982
docs: add docs for new trust subcommands
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 4e797eaa04
2017-10-30 16:53:54 +01:00
d01ed820ce
trust: key-load and key-generate code
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 604bc3f22d
2017-10-30 16:53:53 +01:00
cfe9deca16
trust: add signer-add and signer-remove command
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: dde9f614a7
2017-10-30 16:53:53 +01:00
88e8779c7d
Merge pull request #623 from johndmulhausen/master
...
Removing titles from md files
Upstream-commit: 92afc3f474
2017-10-30 14:01:58 +01:00
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
2017-10-30 01:48:09 +01:00
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
2017-10-28 16:47:53 +02:00
a4aced17f9
Merge pull request #646 from jadametz/add_unpause_output
...
Adds unpause output to docs
Upstream-commit: 7ed96d3b2b
2017-10-28 02:00:40 +02:00
b829f463d9
Merge pull request #636 from dnephin/fix-trust-output-stream
...
Fix stdout and errors in image/trust
Upstream-commit: 54e1378e04
2017-10-27 11:31:01 -04:00
ab4fa07bf0
Merge pull request #621 from charrywanganthony/displaystringutils
...
Refactor stringutils and fix docker search output form
Upstream-commit: e4940cb8d2
2017-10-27 11:08:36 +02:00
4251785d24
Merge pull request #645 from dnephin/use-upstream-spf13-cobra
...
Hide help flag from help output
Upstream-commit: 6aedafd195
2017-10-27 11:00:07 +02:00
e0db409186
Adds unpause output to docs
...
Signed-off-by: Jesse Adametz <jesseadametz@gmail.com >
Upstream-commit: 8bf99be0c7
2017-10-26 23:55:03 -07:00
9a3be7b972
Refactor stringutils and fix docker search output form when the description has CJK character
...
Signed-off-by: Chao Wang <wangchao.fnst@cn.fujitsu.com >
Upstream-commit: 926b20fcb5
2017-10-27 11:15:10 +08:00
