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
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
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
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
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
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
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
555a24da1d
Remove join-tokens from the /info API
...
join-tokens are not needed for this endpoint, and should not be as part
of /info
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
(cherry picked from commit d8f3b3f006629c5c1368eca96bcd5bda2a54acd7)
Upstream-commit: 96b2a6e548bc3abf0f0a505ee020d2fe1e8997de
Component: engine
2016-07-27 18:11:51 -07:00
6a47f2d601
docs: re-enable API 1.25
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2b9838eafed6c9f56a47fecc997cdef9b0203e9a
Component: engine
2016-07-28 02:11:34 +02:00
c5246dacc1
update non-events
...
Signed-off-by: Jess Frazelle <jessfraz@google.com >
Upstream-commit: 6837cfc13cba842186a7261aa9bbd3a8755fd11e
Component: engine
2016-07-27 19:21:16 -04:00
bbee4a3aa4
Merge pull request #25013 from dnephin/remove-extraneous-aliases
...
Remove extraneous mount cli aliases
Upstream-commit: 95ede360e8bd857a6fad2ff0ce08093bfcd6af09
Component: engine
2016-07-27 22:51:56 +00:00
aa7e6b8845
Update usage of "Swarm" for consistency
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f0230049f0afd318217c60ebe486aab3b54538fd
Component: engine
2016-07-27 23:31:55 +02:00
ae11b0dc77
Merge pull request #24816 from stevvooe/service-ps-over-tasks
...
cli: `docker service|node|stack ps` instead of tasks
Upstream-commit: 1a7d339d3698d13a4cf9592e8e73df27bf43664f
Component: engine
2016-07-27 23:13:28 +02:00
3cd473134d
Merge pull request #24760 from anusha-ragunathan/plugin-events
...
Make daemon events listen for plugin lifecycle events.
Upstream-commit: 297745b1cdfb79a12986465f8150e22b0018c640
Component: engine
2016-07-27 13:36:49 -07:00
1cd561da3b
Remove extraneous mount aliases.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 39a3700c01142713e88ff954e86b5dc38174511b
Component: engine
2016-07-27 15:05:31 -04:00
e696a8fadd
Merge pull request #25131 from mavenugo/restoreln
...
Vendoring libnetwork to fix #25109
Upstream-commit: b90f6d780a4b24bcd877505d177593dd5af8107d
Component: engine
2016-07-27 11:09:27 -07:00
6a1ceaa1e1
cli: docker service|node|stack ps instead of tasks
...
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.
This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.
The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:
```
$ docker service ps condescending_cori
ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE
e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 13 minutes ago Running 6c6d232a5d0e
```
The following shows the output for the node on which the command is
running:
```console
$ docker node ps self
ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE
b1tpbi43k1ibevg2e94bmqo0s mad_kalam.1 mad_kalam apline Accepted 2 seconds ago Accepted 6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 12 minutes ago Running 6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5 furious_davinci.1 furious_davinci redis Running 32 minutes ago Running 6c6d232a5d0e
```
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 0aa4e1e68973ede0c73f8a4356e2a17fc903f549
Component: engine
2016-07-27 11:06:42 -07:00
