c5445bc4bb
Merge pull request #25239 from dlech/patch-1
...
Make it clear which parmeter is the user
Upstream-commit: c7fcf496af8f7f5a6f3ab5397857ecfe91cbc192
Component: engine
2016-07-31 08:54:53 +02:00
e8a4996d93
Merge pull request #25066 from lixiaobing10051267/masterErr
...
Add checking err for IsWindowsClient()
Upstream-commit: 4554e6065100d493dd9cd2935901b8532a0dc504
Component: engine
2016-07-30 17:25:08 +01:00
b84877b065
uppercase output in docker info related to swarm mode
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ac13162464f4f80a274d075dca41c2da4d3d73be
Component: engine
2016-07-30 10:14:44 +08:00
6867071d80
Make it clear which parmeter is the user
...
Using the environment variable here also has the advantage that it can be copied and pasted directly in a terminal and it will work.
Signed-off-by: David Lechner <david@lechnology.com >
Upstream-commit: e10ba68bfdbedb47b7e92c3aee5e66e5884d16c3
Component: engine
2016-07-29 19:08:20 -05:00
5473a6ca58
Merge pull request #25182 from sfsmithcha/clarify_join_token
...
Author Merge add advertise address, clarify join token
CI errors expected.
Upstream-commit: ee355e017d210bef02771a8de4733f820ae6b717
Component: engine
2016-07-29 16:10:20 -07:00
a28554905f
add advertise address, clarify join token
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 1e7219d40fcd3b9e3ef6d224e2926d5562fb7b74
Component: engine
2016-07-29 15:45:34 -07:00
95e7541ee8
Merge pull request #25197 from sfsmithcha/add_services_guide
...
author merge: add services guide to manage a swarm
Upstream-commit: 8b69d50c79f75f670fdc87e3e19c651551726605
Component: engine
2016-07-29 15:33:34 -07:00
48f7f6f55e
add services guide to manage a swarm
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 861d4dc989ae738a1c219291a96333a7577b1699
Component: engine
2016-07-29 15:01:52 -07:00
cfcf9ae655
Merge pull request #25243 from allencloud/better-daemon-log-on-graphdriver
...
use %s instead of %q when format in graphdirver log
Upstream-commit: 99525da57cc93706b380910e7f499a999036baca
Component: engine
2016-07-29 14:33:07 -07:00
bac80b795e
Merge pull request #24822 from swernli/skipV1push
...
Fixing v2 registry restriction for non-linux platforms.
Upstream-commit: 0eb1323fba5a46209e4aa99282129b0673c491e3
Component: engine
2016-07-29 14:18:47 -07:00
74764063d5
Merge pull request #24081 from Microsoft/jjh/signaltofile
...
Windows: Stack dump to file
Upstream-commit: 1e6fd0378b431425180bad9fe2c38b296c1bc5bf
Component: engine
2016-07-29 22:09:35 +02:00
6346058d77
Merge pull request #25237 from LK4D4/inc_reconcil_timeout
...
integration: drain node before stop in TestApiSwarmForceNewCluster
Upstream-commit: 8841f530a1e7c7b3c52a943b19e8b24accff9f42
Component: engine
2016-07-29 15:05:16 -04:00
e8d1954574
Merge pull request #24365 from xianlubird/bug/network-list
...
Change buildEndpointResource params avoid repeat visits resource
Upstream-commit: 6bf2db574bb7482b7abce23ef992ff15b6011458
Component: engine
2016-07-29 14:54:05 -04:00
658a5f6d39
use %s instead of %q when format in graphdirver log
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: dec4481e08179bb9fa9ae5adc5b8aa14f2fb5087
Component: engine
2016-07-30 02:12:55 +08:00
4baacc0926
Merge pull request #24819 from Microsoft/jjh/fix24766
...
Windows: Block (v2) pulling Linux images
Upstream-commit: 350c0281c5b7a00f7186925bd0effc09bc55ca6e
Component: engine
2016-07-29 19:48:38 +02:00
3e830fffcd
integration: drain node before stop in TestApiSwarmForceNewCluster
...
It's too long to wait for reschedule.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 307b7b0d151e949024e7ab7ad276b174802a75f2
Component: engine
2016-07-29 10:44:30 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Vincent Demeester
Sebastiaan van Stijn
allencloud
David Lechner
Charles Smith
Tibor Vass
John Howard
Brian Goff
Alexander Morozov
Tibor Vass
Yanqiang Miao
Steve Durrheimer
Akihiro Suda
Kenfe-Mickael Laventure
Justin Cormack
Alexander Morozov
Madhu Venugopal
Aaron Lehmann
Michael Crosby