starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-10-28 08:40:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
36,672 Commits 17 Branches 329 Tags
v17.06.0-ce
Commit Graph
36672 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin 52cbc60fd5 Convert deploy to use a compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cbbc6b4d9bd50f7409c6d935efc899946c449de3
Component: engine
 2016-11-10 11:28:18 -05:00
Daniel Nephin 2885f048a3 Vendor dependencies for compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ed35648151453f71dc59dc5c971ce132ebbc77c9
Component: engine
 2016-11-10 11:28:18 -05:00
Andrew Hsu 3f3a95ef3e use "golang.org/x/net/context" instead of "context" 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: dc32cb6c77
Component: cli
 2016-11-10 08:23:19 -08:00
Andrew Hsu 136327ac5a use "golang.org/x/net/context" instead of "context" 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 2de83a430d5d3f82346cafa15f4bd1f7c47dde12
Component: engine
 2016-11-10 08:23:19 -08:00
Sebastiaan van Stijn 7e57dfce61 Merge pull request #27829 from DieterReuter/fix-aptrepo-distro-versions 
Fix creation of the APT repo directory structure for similar distros
Upstream-commit: 44c816a808198a38c3445c32614d4cef5d9f2736
Component: engine
 2016-11-10 16:23:27 +01:00
Sebastiaan van Stijn dd6a352b1e Merge pull request #28186 from yongtang/27567-follow-up-dns-options 
Add `--dns-option` to `docker run` and hide `--dns-opt`
Upstream-commit: c5fbdc8572
Component: cli
 2016-11-10 16:20:17 +01:00
Sebastiaan van Stijn 8bb2169ed5 Merge pull request #28186 from yongtang/27567-follow-up-dns-options 
Add `--dns-option` to `docker run` and hide `--dns-opt`
Upstream-commit: 33af4dd505aac709d607d26fc19a16d3dffdd66e
Component: engine
 2016-11-10 16:20:17 +01:00
Vincent Demeester fa835841f3 Merge pull request #28233 from erxian/update-network-ls-docs 
update network ls docs to add SCOPE
Upstream-commit: c730a96454dc4098b2579e2f6093e6749b60be98
Component: engine
 2016-11-10 16:16:13 +01:00
Ian Campbell 0c5c18d606 pkg/jsonmessage: Avoid undefined ANSI escape codes. 
The ANSI escape codes \e[0A (cursor up 0 lines) and \e[0B (cursor down 0 lines)
are not well defined and are treated differently by different terminals. In
particular xterm treats 0 as a missing parameter and therefore defaults to 1,
whereas rxvt-unicode treats these escapes as a request to move 0 lines.

However the use of these codes is unnecessary and were really just hiding the
fact that we were not correctly computing diff when adding a new line. Having
added the new line to the ids map and output the corresponding \n we need to
then calculate a correct diff of 1 rather than leaving it as the default 0
(which xterm then interprets as 1). The fix is to pull the diff calculation out
of the else case and to always do it.

With this in place we can then avoid outputting escapes for moving 0 lines.
Actually diff should never be 0 to start with any more, but check to be safe.

This fixes corruption of `docker pull` seen with rxvt-unicode (and likely other
terminals in that family) seen in #28111. Tested with rxvt-unicode
($TERM=rxvt-unicode), xterm ($TERM=xterm), mlterm ($TERM=mlterm) and aterm
($TERM=kterm).

The test cases have been updated to match the new behaviour.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: b08b437acc3bf52bd2c3435e632ed09f3312e489
Component: engine
 2016-11-10 14:10:47 +00:00
Marcus Cobden fa6bdfd965 Add Image ID & Ref to container commit event 
Signed-off-by: Marcus Cobden <mcobden@cisco.com>
Upstream-commit: e60ae5380208c9329ef8be38fe3f4bdcd8ef6e83
Component: engine
 2016-11-10 10:05:25 +00:00
Vincent Demeester becc27c95f Merge pull request #28220 from tophj-ibm/test-killing-with-stop-signals 
[integration-cli] fix race condition in kill tests
Upstream-commit: 7df0ed49d7f6e0cbcdef39dbae8900f882d785cb
Component: engine
 2016-11-10 10:51:38 +01:00
Victor Vieux 3aca7843a9 rename plugin manifest 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0ae9598f96
Component: cli
 2016-11-10 00:09:23 -08:00
Victor Vieux 6949dd3368 rename plugin manifest 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 49ca91fbebbea80587ce3c0814bba3b41cce14a0
Component: engine
 2016-11-10 00:09:23 -08:00
Nishant Totla 58e0e2f371 Pin image by digest on service create and update 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 764a9ed357bca8fdccf1a794278463453f83f6ff
Component: engine
 2016-11-09 23:31:26 -08:00
Victor Vieux 317a3879fc Merge pull request #28224 from vieux/fix_manpages 
fix manpages
Upstream-commit: e876381912
Component: cli
 2016-11-09 23:22:30 -08:00
Victor Vieux be247ad0fb Merge pull request #28224 from vieux/fix_manpages 
fix manpages
Upstream-commit: d286734b41cf3811021c5347412b8094638c0adc
Component: engine
 2016-11-09 23:22:30 -08:00
erxian 3376796c8e update network ls docs to add SCOPE 
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 9410f4cc869a3f5f569d32741d1622f2d38a5207
Component: engine
 2016-11-10 12:18:08 +08:00
Brian Goff 3d84cacc07 Merge pull request #28138 from dmcgowan/handle-overlay2-copy-up-bug 
Use naive diff for overlay2 when opaque copy up bug present
Upstream-commit: a3b0ade34685f4f25875a0a485814d1acf373af3
Component: engine
 2016-11-09 22:29:19 -05:00
yuexiao-wang f3074c32a8 Remove redundant parameter and fix typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 713cae7ca2b8a5fa36e25f3fb30531f6400fafc3
Component: engine
 2016-11-10 11:05:31 +08:00
yuexiao-wang 31f3e07b0b Remove redundant parameter and fix typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b6fe99530c
Component: cli
 2016-11-10 11:05:31 +08:00
Victor Vieux 34493b85fd Merge pull request #28219 from darrenstahlmsft/WindowsConflictingOptions 
Adding more strict resource checks on Windows
Upstream-commit: f7b27ded4ac7cdcea7015e9eb55c4529dec3970d
Component: engine
 2016-11-09 18:01:03 -08:00
Victor Vieux 0f8fed3268 Merge pull request #28150 from AkihiroSuda/mounttmpcli 
opts/mount: add tmpfs-specific options
Upstream-commit: 55543c45a20b38262b966548b05738260d67b065
Component: engine
 2016-11-09 17:50:04 -08:00
Victor Vieux 557c959fcf Merge pull request #28164 from anusha-ragunathan/plugin-build 
Add plugin create functionality.
Upstream-commit: 98408aa5c8
Component: cli
 2016-11-09 17:49:51 -08:00
Victor Vieux 781f497519 Merge pull request #28164 from anusha-ragunathan/plugin-build 
Add plugin create functionality.
Upstream-commit: 1a34843c0c
Component: cli
 2016-11-09 17:49:51 -08:00
Victor Vieux 62ec0be101 Merge pull request #28164 from anusha-ragunathan/plugin-build 
Add plugin create functionality.
Upstream-commit: 28a1ea342d1f227664ad30ffd05eaaab8c9ef93e
Component: engine
 2016-11-09 17:49:51 -08:00
Victor Vieux 486562b02a Merge pull request #27967 from aaronlehmann/encryption 
Encryption at rest of manager keys and raft data
Upstream-commit: 18a07f599127f9aa6743de372f0384ffe31fd872
Component: engine
 2016-11-09 17:49:26 -08:00
Victor Vieux 90efedd5e2 fix manpages 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 96c16101dd
Component: cli
 2016-11-09 17:11:14 -08:00
Victor Vieux c27b5695c1 fix manpages 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8e701f0bd7f6be30d8b23010b2a7daf8e15981ec
Component: engine
 2016-11-09 17:11:14 -08:00
Darren Stahl 828e14b6f7 Adding more strict resource checks on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 0ed00b36ff7d8651e4d11a41507f81441c081388
Component: engine
 2016-11-09 16:29:54 -08:00
Aaron Lehmann c4b7cbe0fb Document autolock/unlock/unlock-key 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 824db2c4543f912c1fdf392ebbaefa5540bc88a4
Component: engine
 2016-11-09 16:12:11 -08:00
Aaron Lehmann b9674ce3e8 Add unlock key rotation 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: de1b8f9439
Component: cli
 2016-11-09 16:09:01 -08:00
Aaron Lehmann f93e810a9b Add unlock key rotation 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 65e1e166ee
Component: cli
 2016-11-09 16:09:01 -08:00
Aaron Lehmann f3d621f988 Lock/unlock integration tests 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c3c70c4bcd775d20e2d4a4989733f7ad6b2b90b2
Component: engine
 2016-11-09 16:09:01 -08:00
Aaron Lehmann 2394a196a1 Add unlock key rotation 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: a6030a50c95cd4e8b39b5f4d5705bb23ebdb28c5
Component: engine
 2016-11-09 16:09:01 -08:00
Aaron Lehmann 50e796a0be Revise swarm init/update flags, add unlocking capability 
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: a8dc2ff916
Component: cli
 2016-11-09 16:09:00 -08:00
Aaron Lehmann c3469cb075 Revise swarm init/update flags, add unlocking capability 
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 56b7ad90b1
Component: cli
 2016-11-09 16:09:00 -08:00
Aaron Lehmann 0827ead1b6 Revise swarm init/update flags, add unlocking capability 
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 0f9fc54df9274327ed22f4e07f0981a648e0278a
Component: engine
 2016-11-09 16:09:00 -08:00
Tonis Tiigi 798fd349f4 Add support for swarm init lock and swarm unlock 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: dd81022c23
Component: cli
 2016-11-09 16:09:00 -08:00
Tonis Tiigi fc02a64b8c Add support for swarm init lock and swarm unlock 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d006a04357
Component: cli
 2016-11-09 16:09:00 -08:00
Tonis Tiigi 6a03ee3d4e Add integration tests for encrypted swarm 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8b1f72ad44f03d4786cb3e881b480c94a143885f
Component: engine
 2016-11-09 16:09:00 -08:00
Tonis Tiigi 2874df7efa Add support for swarm init lock and swarm unlock 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b4a667c8c4f536445d35e8914a58e8c749f16ea6
Component: engine
 2016-11-09 16:09:00 -08:00
Tonis Tiigi f5437c0d78 vendor: update errors to 839d9e91 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 472ecae0d801f71d8b44f4ca7a9fff0b9271799f
Component: engine
 2016-11-09 16:09:00 -08:00
Tonis Tiigi 1e77cc5379 vendor: update swarmkit to bddd3f0 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2a68f0f0016caa6cef8d32726002b9ad02a4c56c
Component: engine
 2016-11-09 16:08:52 -08:00
Sebastiaan van Stijn 75a25a369f Merge pull request #27915 from rhvgoyal/graph-create-opts 
Pass all graphdriver create() parameters in a struct
Upstream-commit: f11ac963af5a94ae0c36aaa2a67a671c6a313e59
Component: engine
 2016-11-10 01:07:41 +01:00
Victor Vieux 174f2a0d72 Merge pull request #28025 from vdemeester/swarm-mode-templating 
Add support for swarm mode templating
Upstream-commit: 8ffd1a370c447db92a67d17f900ccd453dbcedee
Component: engine
 2016-11-09 15:57:52 -08:00
Jana Radhakrishnan 3e9922773f Merge pull request #28078 from sanimej/inspect 
Show peer nodes in network inspect for swarm overlay networks
Upstream-commit: 5ef5a4216a83421122461c90b7aa1ca1d709c4c8
Component: engine
 2016-11-09 15:33:13 -08:00
Anusha Ragunathan 7c006ff288 Add plugin create functionality. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 3d7a95829e
Component: cli
 2016-11-09 15:23:03 -08:00
Anusha Ragunathan 878834ace0 Add plugin create functionality. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: b825c58ff8
Component: cli
 2016-11-09 15:23:03 -08:00
Anusha Ragunathan 948055475e Add plugin create functionality. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 5b6e1bc9e551ba56b44c3f409fd5d48f8a54ce1d
Component: engine
 2016-11-09 15:23:03 -08:00
Victor Vieux a16c95482f Merge pull request #28212 from crosbymichael/tini-deps 
Add tini deps for deb and rpm
Upstream-commit: 75091abe76531d4373aba2da680b695e5dbb8fc8
Component: engine
 2016-11-09 15:20:58 -08:00