Commit Graph

38721 Commits

Author SHA1 Message Date
d7062e5443 Merge pull request #285 from seemethere/bump_17110_rc2
[17.11] bump version to 17.11.0-ce-rc2
v17.11.0-ce-rc2
2017-11-01 12:14:22 -07:00
2b39e3eb1b Merge pull request #284 from seemethere/update_changelog_17110_rc2
[17.11] Update changelog for 17.11.0 rc2
2017-11-01 12:14:00 -07:00
019b6fc6ff Merge pull request #286 from andrewhsu/st
[17.11] backport Add containerd static compile
2017-11-01 12:13:29 -07:00
1d7a951815 Add containerd static compile
Fixes #35349

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 007db062f0c39bf31e1150aa26d045778ab7d24e)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-31 14:11:42 -07:00
7c931da69a Merge pull request #283 from seemethere/add_artful
[17.11] Add Ubuntu Artful (17.10)
2017-10-31 13:48:25 -07:00
c87c16c585 Update changelog to include note about Artful
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-10-31 13:33:40 -07:00
7a42750bbc bump version to 17.11.0-ce-rc2
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-10-31 13:31:15 -07:00
419eadcc09 Update to 1.8.5
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit c16053e90143cd8a9a559b749407d938f0cb4456)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-10-31 13:20:54 -07:00
a241bc8c28 Add Ubuntu 17.10, Artful
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 1468941a50dba7e0a82a01cb938338041f028ef9)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-10-31 13:20:54 -07:00
df7b627909 Merge pull request #282 from andrewhsu/v
[17.11] bump version to 17.11.0-ce-rc1
v17.11.0-ce-rc1
2017-10-30 17:24:29 -07:00
3d4e607150 Merge pull request #281 from andrewhsu/c
[17.11] update changelog for 17.11.0-ce-rc1
2017-10-30 17:00:03 -07:00
e2e7ecf1d7 update changelog for 17.11.0-ce-rc1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-10-30 16:59:25 -07:00
f7aa41c4f5 Merge pull request #279 from andrewhsu/sk
[17.11] skip tests for now that are known to need adjustment
2017-10-30 16:57:21 -07:00
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
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
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
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
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
7cbbc92838 Merge component 'engine' from git@github.com:moby/moby master 2017-10-30 21:52:27 +00:00
b9bd420700 Merge component 'cli' from git@github.com:docker/cli master 2017-10-30 21:32:56 +00:00
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
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
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
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
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
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
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
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
17ef49339b Merge component 'cli' from git@github.com:docker/cli master 2017-10-30 17:32:31 +00:00
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
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
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
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
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
c75c0e3626 Merge component 'engine' from git@github.com:moby/moby master 2017-10-30 16:00:31 +00:00
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
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
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
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
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
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
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
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
a2d940cc8d Merge component 'cli' from git@github.com:docker/cli master 2017-10-30 15:41:05 +00:00
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
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
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
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
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
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