toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
38,745 Commits 3 Branches 295 Tags
4ba6cdc4518c00f3b406d46d5d1194dde06e4eaa
Commit Graph

38745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tonis Tiigi
4ba6cdc451 libcontainerd: fix leaking container/exec state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 6c4ce7cb6c62fb82ed2db1d4ee3a02bc5148cdee)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-11-14 22:23:20 +00:00
Andrew Hsu
5b4af4f712 Merge pull request #287 from andrewhsu/v 
[17.11] bump version to 17.11.0-ce-rc3
v17.11.0-ce-rc3 		2017-11-07 18:57:53 -08:00
Andrew Hsu
65fdc1d854 Merge pull request #294 from vieux/CHANGELOG 
[17.11] add changelog for 17.11
 2017-11-07 18:56:40 -08:00
Andrew Hsu
df9728fca7 Merge pull request #298 from andrewhsu/tar 
[17.11] vendor: update to github.com/vbatts/tar-split@v0.10.2
 2017-11-07 18:55:37 -08:00
Victor Vieux
3552e30c52 add changelog for 17.11 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-11-07 14:39:10 -08:00
Andrew Hsu
c4eae51de5 Merge pull request #297 from andrewhsu/scra 
[17.11] Set OS on scratch image and prevent panic if empty
 2017-11-07 14:28:23 -08:00
Aleksa Sarai
ff01ab4a0a image: add import test for CVE-2017-14992 
To ensure that we don't revert CVE-2017-14992, add a test that is quite
similar to that upstream tar-split test (create an empty archive with
lots of junk and make sure the daemon doesn't crash).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
(cherry picked from commit 0a13f827a10d3bf61744d9b3f7165c5885a39c5d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-11-07 14:13:58 -08:00
Aleksa Sarai
4cd44b4bf2 internal: testutil: add DevZero helper 
This helper acts like /dev/zero (outputs \x00 indefinitely) in an
OS-independent fashion. This ensures we don't need to special-case
around Windows in tests that want to open /dev/zero.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
(cherry picked from commit 2f8d3e1c33f77187c68893803018756d43daff15)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-11-07 14:13:58 -08:00
Aleksa Sarai
b25cbcb9af vendor: update to github.com/vbatts/tar-split@v0.10.2 
Update to the latest version of tar-split, which includes a change to
fix a memory exhaustion issue where a malformed image could cause the
Docker daemon to crash.

  * tar: asm: store padding in chunks to avoid memory exhaustion

Fixes: CVE-2017-14992
Signed-off-by: Aleksa Sarai <asarai@suse.de>
(cherry picked from commit e0ff7cccc3cac73da41ec9ef007b0e4e97c55d01)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-11-07 14:13:58 -08:00
Andrew Hsu
d0eae44a32 Merge pull request #295 from andrewhsu/sk 
[17.11] update vndr of swarmkit to bbcec9b9
 2017-11-07 12:03:22 -08:00
John Stephens
c2888f5973 Set OS on scratch image and prevent panic if empty 
Signed-off-by: John Stephens <johnstep@docker.com>
(cherry picked from commit a97817b673cbd3bfaf6e752282c4992ac43ff594)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-11-07 10:52:36 -08:00
Andrew Hsu
2d28b718bd Merge pull request #292 from thaJeztah/17.11-backport-improve-containerd-version-parsing 
[17.11] Use containerd API to get version
 2017-11-06 17:40:42 -08:00
Nishant Totla
75d1e697a5 Fix error message for TestSwarmVolumePlugin 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-11-06 17:22:50 -08:00
Andrew Hsu
fa6c13b518 Merge pull request #296 from andrewhsu/ln 
[17.11] update vndr of libnetwork to 6bbcd1b
 2017-11-06 16:48:13 -08:00
Andrew Hsu
ada8d460c1 Merge pull request #290 from thaJeztah/backport-mask-scsi 
[17.11] Add /proc/scsi to masked paths
 2017-11-06 15:37:25 -08:00
Andrew Hsu
1894fce853 Merge pull request #293 from thaJeztah/17.11-backport-stream-ctx-fix 
[17.11] builder: fix long stream sync
 2017-11-06 13:33:57 -08:00
Andrew Hsu
40dc614b99 Merge pull request #289 from andrewhsu/dl 
[17.11]  cluster: avoid recursive readlock on swarm info
 2017-11-06 12:57:40 -08:00
Andrew Hsu
6aaa5504a2 update vndr of libnetwork to 6bbcd1b 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-11-06 12:48:57 -08:00
Andrew Hsu
f41a4e7f46 update vndr of swarmkit to bbcec9b9 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-11-06 12:23:21 -08:00
Tonis Tiigi
36134084bc builder: fix long stream sync 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit c6703b722e1c0914342d61ca6af77aea93150873)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-11-06 14:12:07 +01:00
Sebastiaan van Stijn
90d2a2e274 Use containerd API to get version 
The `docker info` code was shelling out to obtain the
version of containerd (using the `--version` flag).

Parsing the output of this version string is error-prone,
and not needed, as the containerd API can return the
version.

This patch adds a `Version()` method to the containerd Client
interface, and uses this to get the containerd version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fec2b144feaaa18998ec2ed34c9bc843c4c29abd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-11-06 14:05:37 +01:00
Justin Cormack
b524364a2f Add /proc/scsi to masked paths 
This is writeable, and can be used to remove devices. Containers do
not need to know about scsi devices.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
(cherry picked from commit a21ecdf3c8a343a7c94e4c4d01b178c87ca7aaa1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-11-06 13:58:25 +01:00
Tonis Tiigi
84070b5f49 cluster: avoid recursive readlock on swarm info 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>(cherry picked from commit ee1be71e9dc52db8a7ac951ba96f18a5c894806a)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-11-03 15:58:11 -07:00
Andrew Hsu
2757141770 bump version to 17.11.0-ce-rc3 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-11-03 10:31:46 -07:00
Andrew Hsu
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
Andrew Hsu
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
Andrew Hsu
019b6fc6ff Merge pull request #286 from andrewhsu/st 
[17.11] backport Add containerd static compile
 2017-11-01 12:13:29 -07:00
Michael Crosby
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
Andrew Hsu
7c931da69a Merge pull request #283 from seemethere/add_artful 
[17.11] Add Ubuntu Artful (17.10)
 2017-10-31 13:48:25 -07:00
Eli Uriegas
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
Eli Uriegas
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
Eli Uriegas
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
Eli Uriegas
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
Andrew Hsu
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
Andrew Hsu
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
Andrew Hsu
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
Andrew Hsu
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
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 Hsu
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 Stijn
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 Stijn
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 Tang
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 Stijn
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 Uriegas
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 Goff
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