toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,329 Commits 3 Branches 295 Tags
0aa5d77457ccc421c2c87cc5dee667aaba7971e3
Commit Graph
26329 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass 9bbc0950e9 Merge pull request #25238 from tiborvass/merge_release_1.12.0 
Merge release 1.12.0
Upstream-commit: 295679cabe26010f4d8da3b878022fcb3a9475b2
Component: engine
 2016-07-29 10:44:22 -07:00
Tibor Vass 458a96bbea Bump VERSION to 1.13.0-dev 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8af69c705720f7b4feec48dee092bdeeadf39e14
Component: engine
 2016-07-29 10:25:06 -07:00
Tibor Vass 664efad9ed 1.12.0 CHANGELOG to master 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: ae33306b14ce3c156c6a3fb3dd67a1aeae426f16
Component: engine
 2016-07-29 10:24:36 -07:00
Tibor Vass 0b9c568fe7 Bump VERSION to v1.12.0 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 8eab29edd820017901796eb60d4bea28d760f16f)
Upstream-commit: adba074489a5a0cd5671686303150839a66ee60f
Component: engine
 2016-07-29 10:23:45 -07:00
Brian Goff 481a5ed3bf Merge pull request #24020 from yongtang/23973-rename-with-linked-container 
Fix docker rename with linked containers
Upstream-commit: 10fcd30a905b527d99c1a2f82f2e67b100594d95
Component: engine
 2016-07-29 12:24:35 -04:00
Michael Holzheu ca5f5427a8 TestRunSeccompUnconfinedCloneUserns: Check for unprivileged_userns_clone 
On Ubuntu and Debian there is a sysctl which allows to block
clone(CLONE_NEWUSER) via "sysctl kernel.unprivileged_userns_clone=0"
for unprivileged users that do not have CAP_SYS_ADMIN.

See: https://lists.ubuntu.com/archives/kernel-team/2016-January/067926.html

The DockerSuite.TestRunSeccompUnconfinedCloneUserns testcase fails if
"kernel.unprivileged_userns_clone" is set to 0:

 docker_cli_run_unix_test.go:1040:
    c.Fatalf("expected clone userns with --security-opt seccomp=unconfined
              to succeed, got %s: %v", out, err)
 ... Error: expected clone userns with --security-opt seccomp=unconfined
              to succeed, got clone failed: Operation not permitted
 : exit status 1

So add a check and skip the testcase if kernel.unprivileged_userns_clone is 0.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 87e4e3af68741afcebf11499d1dcbc91b655b349
Component: engine
 2016-07-29 12:16:03 -04:00
Christy Perez 76803189a4 More accurate cgroup error messages 
A kernel may support any of these, but an admin may have unmounted
certain cgroups, so let's include that possibility in the error so
as to avoid users thinking they have a kernel issue.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 846f33f93d9cd32ed90680d106cd5d9eb96b0ddd
Component: engine
 2016-07-29 09:50:50 -05:00
Sebastiaan van Stijn d5baf8c1b5 Merge pull request #25210 from miaoyq/delete-a-useless-variable 
delete a useless variable
Upstream-commit: a71033f8e5a0ab0b0e37438dc0ab15b81bdde24a
Component: engine
 2016-07-29 16:05:39 +02:00
Bryan Boreham 9111a66ef5 Use the name of the first unix socket in DOCKER_OPTS 
Otherwise the while loop waits forever, checking for
a filename made up of all the names.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 68dab9bd0910e22c96d5dfcbd4e972f8ce770a88
Component: engine
 2016-07-29 14:04:43 +01:00
Sebastiaan van Stijn bbd602ff18 Merge pull request #25208 from sdurrheimer/zsh-completion-service-create-update-container-labels 
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}
Upstream-commit: 3b7ea4d8c3c217f1efc303d3b5e97c3743db6fe0
Component: engine
 2016-07-29 09:59:46 +02:00
Sebastiaan van Stijn 53ba6397c0 Merge pull request #25207 from sdurrheimer/zsh-completion-remove-swarm-inspect 
Remove zsh completion for 'docker swarm inspect'
Upstream-commit: d3f32d212b042e369bd6af5e9c3064c429c6f9b7
Component: engine
 2016-07-29 09:58:32 +02:00
Yanqiang Miao e347f2b7f4 delete a useless variable 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 87cada6d7f62589ce77dc0557ad97f4140b49c70
Component: engine
 2016-07-29 15:34:21 +08:00
Steve Durrheimer d93ece1752 Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ab95ec3dd927d5c0c303410519f07631c8c99a4e
Component: engine
 2016-07-29 07:54:10 +02:00
Steve Durrheimer e73302a349 Remove zsh completion for 'docker swarm inspect' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f146f6127ce5c7a5f579b78f00bd06f68198ce0f
Component: engine
 2016-07-29 07:41:27 +02:00
Vincent Demeester bb300af70f Merge pull request #23759 from AkihiroSuda/cobraexec 
Migrate exec command to cobra
Upstream-commit: 3d42bf5f120b6cbd38b54f71dff4343c316939a0
Component: engine
 2016-07-29 07:41:02 +02:00
Vincent Demeester feb2160968 Merge pull request #24986 from mlaventure/add-live-restore-to-info 
Add live restore to info
Upstream-commit: faf9dac22c902701eeae26cabaedea6d91e01bd5
Component: engine
 2016-07-29 07:37:56 +02:00
Vincent Demeester 1c72cebc59 Merge pull request #23969 from tkopczynski/20784-builder-dockerfile-dispatchers-2 
Builder dispatchers unit tests
Upstream-commit: 0fc062d31ea00286c49d2310e245b6bb7b4a16e1
Component: engine
 2016-07-29 07:26:48 +02:00
Akihiro Suda d22f93678b Migrate exec command to cobra 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 9d9dff3d0d9e92adf7c2e59f94c63766659d1d47
Component: engine
 2016-07-29 02:10:36 +00:00
Sebastiaan van Stijn c45216ee6a Merge pull request #24535 from thaJeztah/minor-docs-fixup 
docs: cleanup docker update docs
Upstream-commit: 498cd1742789481b5c9d75537d29d5f92ed9f20c
Component: engine
 2016-07-29 02:53:01 +02:00
Sebastiaan van Stijn 880aee0b42 Merge pull request #25189 from aaronlehmann/service-list-counter 
service ls: Show tasks from nodes that are not down, not only "ready" nodes
Upstream-commit: 246d3cdb9adcbcbbc2aa9ed5027228e8cc742299
Component: engine
 2016-07-29 02:48:43 +02:00
Sebastiaan van Stijn 9b3fd45051 Merge pull request #22911 from vdemeester/20033-default-logging-tag-value 
Standardize default logging tag value
Upstream-commit: 48569e0a35934c566b60b99c5c40ac13df517cac
Component: engine
 2016-07-29 02:18:57 +02:00
Daniel Nephin 3564d84153 Remove unnecessary CmdWithArgs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0d2f7b33869cf749efcbab003bdb9bd2f665cec
Component: engine
 2016-07-28 20:14:14 -04:00
Daniel Nephin 6486d4730a Remove hack from test name. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0ec20a3c015c998d43925554498a73b52307dc90
Component: engine
 2016-07-28 20:12:36 -04:00
Kenfe-Mickael Laventure c68f19845d Add live-restore state to daemon reload event 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: ff62681d59231489e1ef01767a4db66efd54cf2f
Component: engine
 2016-07-28 17:10:40 -07:00
Kenfe-Mickael Laventure e1f42120bb Add live-restore state to docker info output 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 189aaf8aea953c591f36ac340ad96def1131e869
Component: engine
 2016-07-28 17:10:40 -07:00
Kenfe-Mickael Laventure eec8319268 Rename config LiveRestore to LiveRestoreEnabled 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: b94542239313bbf960e6718c6b54bbbcbacdfffa
Component: engine
 2016-07-28 17:10:40 -07:00
Justin Cormack 8908f2eb82 Merge pull request #24422 from runcom/osxcross-update 
Dockerfile: update osx cross toolchain
Upstream-commit: 2a84206add5298ad6204ea51fda47be167ea0357
Component: engine
 2016-07-29 01:03:28 +01:00
Justin Cormack bced48a04a Merge pull request #25034 from thaJeztah/update-swarm-usage 
Update usage of "Swarm" for consistency
Upstream-commit: c388a5bdfa922d85373cc8a77a08612ca4b67861
Component: engine
 2016-07-29 01:01:00 +01:00
Alexander Morozov 9c4e84e8f7 Merge pull request #24976 from lixiaobing10051267/masterFound2 
To break the loop when found in search_test.go
Upstream-commit: 803e2f285a974b23db2b042846d33e98c5ed53d6
Component: engine
 2016-07-28 16:59:46 -07:00
Justin Cormack fd99a88e88 Merge pull request #24835 from justincormack/armextlink 
Do not default to external linking on arm, i386
Upstream-commit: a846fa7ac9ab85f8a2798ef299f88324047ec8c9
Component: engine
 2016-07-29 00:57:56 +01:00
Alexander Morozov 4cd88300bd Merge pull request #24502 from allencloud/change-comparison-log-in-container-config 
update comparison log in container config
Upstream-commit: ca43efb40eb011e0f8adaca2eda77a5330f02089
Component: engine
 2016-07-28 16:51:11 -07:00
Alexander Morozov 488d786bb3 Merge pull request #24745 from daehyeok/logrus 
Refactoring for logrus formatting
Upstream-commit: 170abb5f7cabf4921a378d76532e74a272fbe39c
Component: engine
 2016-07-28 16:50:19 -07:00
Alexander Morozov 3ee2799172 Merge pull request #24555 from thaJeztah/to-infinity-and-beyond 
Don't set ulimits (nproc) for all init scripts
Upstream-commit: 4084bf7ad23f1c82601e4cbcc2d224c3bc7e0b12
Component: engine
 2016-07-28 16:48:16 -07:00
Alexander Morozov c6812e2679 Merge pull request #24663 from hopkings2008/repeated_api 
remove the second repeated line cli.api = api since api is a pointer
Upstream-commit: d8a2568e6b3aeab8d7d11a05d3ec98cf0245211d
Component: engine
 2016-07-28 16:45:30 -07:00
Alexander Morozov f3d95a7a8f Merge pull request #22982 from nalind/log-newlines 
Improve logging of long log lines
Upstream-commit: e43033bc238ce61466c0abe3702878eeeba5e917
Component: engine
 2016-07-28 16:41:01 -07:00
John Howard daa8773ec1 Merge pull request #25190 from mavenugo/dl 
Cherry-pick #25191 to master
Upstream-commit: 57698cfe7902199bed476657c8f1255af38f9f24
Component: engine
 2016-07-28 16:30:02 -07:00
Madhu Venugopal f9dff992a9 Vendoring libnetwork to avoid a deadlock 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 4f369a74fac5023e9a46de4b4dbe121a7c2b2c81)
Upstream-commit: 61e59693dc3407ba1d68f8a5be17c117a96467e4
Component: engine
 2016-07-28 15:12:45 -07:00
Aaron Lehmann a867691c0e service ls: Show tasks from nodes that are not down, not only "ready" nodes 
Currently, the counter only shows tasks on READY nodes. It's more
correct to also count nodes in the other states except DOWN, because
the tasks assocated with those nodes are still assumed to be running for
orchestration purposes. One example of when this could matter is during
a leader failover when agents are in the process of reconnecting.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 614ad95fbbb7d9f94369a722cb7f557286293fc5
Component: engine
 2016-07-28 11:44:28 -07:00
Michael Crosby dbdb5ac0d4 Merge pull request #25185 from crosbymichael/cherry-restore 
Check if the container is running if no event
Upstream-commit: 42c783ac3ae16b8358313fefa9fb100b1e01f927
Component: engine
 2016-07-28 11:23:26 -07:00
Michael Crosby 665067dce6 Check if the container is running if no event 
When there is no event for the container it can happen because of a
crash and the container state on the persistent disk will have a
mismatch between what was in `/run` ( machine crash ).

This situation will create an unkillable container in docker because
containerd does not see it and it is not running but docker thinks it is
and you cannot tell it anything different.

This fixes the issue by checking if containerd has the container running
if we do not have an event instead of just returning.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2650b1b6abd87d7d888e27abd6110dea83dcd080
Component: engine
 2016-07-28 11:17:02 -07:00
Tibor Vass 333de2a679 Merge pull request #25154 from aaronlehmann/remove-join-tokens-from-info-master 
Remove join-tokens from the /info API
Upstream-commit: 58d0d5b6b5cc048bf5b59f69862182e55526f91e
Component: engine
 2016-07-28 11:08:50 -07:00
Michael Crosby 8e586b192e Merge pull request #25077 from cpuguy83/fix_TestApiSwarmRestartCluster 
Fix race in `TestApiSwarmRestartCluster`
Upstream-commit: 262063531a4845c436b64deff9a7fca9f90c0c13
Component: engine
 2016-07-28 10:15:31 -07:00
Brian Goff b20b8c2790 Use temp dir for integration daemon sockets 
Instead of using the bundles dir, which may be mounted in and ultimately
break if using b2d/d4mac/d4win. This makes it much easier to collect
test daemon logs and more natural for use d4mac/d4win users to run tests.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4804eb700c3b9f0e337abc6e3c51b031c0328482
Component: engine
 2016-07-28 12:53:56 -04:00
Sebastiaan van Stijn a2827e4f47 Merge pull request #25137 from justincormack/32bit-seccomp-test 
Add a test that the default seccomp profile allows execution of 32 bit binaries
Upstream-commit: 8a8a63aa32a60e12b3c4d8e9e3397a8bd3b96d54
Component: engine
 2016-07-28 17:01:04 +02:00
Brian Goff c723d60fcd Merge pull request #25168 from miaoyq/optimize-a-print 
optimize a print in `volume/volume.go`
Upstream-commit: b09f28016166ea36f36916098ab18fd86a0eaa57
Component: engine
 2016-07-28 09:16:17 -04:00
Yanqiang Miao 57c5690493 optimize a print in 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update 'optimize-a-print'

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: a503f3ac2fdb5f24b7ca982fc6447423095f229e
Component: engine
 2016-07-28 19:20:20 +08:00
Sebastiaan van Stijn e1bdcf299e Merge pull request #25152 from thaJeztah/re-enable-api-1.25 
docs: re-enable API 1.25
Upstream-commit: 193b03615957e0aa41dbb5e675ab3530a501adb1
Component: engine
 2016-07-28 09:38:20 +02:00
Sebastiaan van Stijn 7fc346bc16 Merge pull request #25020 from jfrazelle/update-non-events 
update security non-events
Upstream-commit: 14664beda923dc9249cbd4ac4f024319668e57c0
Component: engine
 2016-07-28 09:29:51 +02:00
Sven Dowideit 2277dd5414 Merge pull request #25156 from londoncalling/docs-v112-getstarted-a 
modifed d4mac and d4win download links to stable for v1.12
Upstream-commit: 352c720d69f6c37c9b1e15332f46ea2dc4335cb9
Component: engine
 2016-07-28 17:08:54 +10:00
Victoria Bialas 77366c6416 modifed d4mac and d4win download links to stable for v1.12 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: ef528abcda1a4a7a1b605b57b56c5f3b630146bc
Component: engine
 2016-07-27 18:57:38 -07:00