Commit Graph

27211 Commits

Author SHA1 Message Date
Shayne Wang c22557cc46 Change reading order of tailfile
change reading order from beginning at the end to beginning at a buffer start
added intergration tests for boundary cases
Removed whitespace
Signed-off-by: Shayne Wang <shaynexwang@gmail.com>
Upstream-commit: 63904eb6745d553573ffe8b7cef43dfc0b8a07cf
Component: engine
2016-11-13 20:08:51 -08:00
Yanqiang Miao 9e9974619f Fix a comment error
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 19e2c9177a111758e304ad9dbd0835cddbd840ab
Component: engine
2016-11-14 09:55:27 +08:00
Vincent Demeester a107ce5f56 Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API
judge manager before getting secret
Upstream-commit: 0f20d6f5ab24e5b05bd49165ecc11e9bafaf6833
Component: engine
2016-11-13 22:19:07 +01:00
Akihiro Suda e8319d6f50 Merge pull request #28362 from albers/completion-service-dns
Add bash completion for DNS settings in services
Upstream-commit: f39cb08209ceffcb3363ab1f46007f11cb287211
Component: engine
2016-11-14 05:42:24 +09:00
Vincent Demeester 829db7abcd Merge pull request #28360 from albers/completion-service-ps--all
Add bash completion for `docker service ps --all`
Upstream-commit: e649cc147630746b1e98424933ee457d3f0c7f46
Component: engine
2016-11-13 21:39:07 +01:00
Vincent Demeester 560a7b97d2 Merge pull request #28357 from sdurrheimer/zsh-completion-service-ports
Add zsh completion for 'docker service {create --port, update --port-…
Upstream-commit: f1dd4c5ad8fbbe8cb977389d042879a6960f9605
Component: engine
2016-11-13 21:38:17 +01:00
Vincent Demeester 22c20a57de Merge pull request #28355 from sdurrheimer/zsh-completion-build-cache-from
Add zsh completion for 'docker image build --cache-from'
Upstream-commit: bf2c875cd60df4e7f2fcf28bd56b54dfd67e878e
Component: engine
2016-11-13 21:37:10 +01:00
Vincent Demeester dfc6729ba9 Merge pull request #28342 from albers/completion-build--cache-from
Add bash completion for `docker build --cache-from`
Upstream-commit: 7220888b0988d4ddfc5fea783420e2dd4b26ff00
Component: engine
2016-11-13 21:34:55 +01:00
Vincent Demeester e7777cd3a6 Merge pull request #28310 from mlaventure/docker-info-update
Docker info binaries version update
Upstream-commit: 1e673b9876ab4a12e7718424db9484fca6f516b3
Component: engine
2016-11-13 21:24:51 +01:00
Harald Albers d74191c744 Add bash completion for DNS settings in services
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 28dc8c863a810a5fce078319fb422caced67b725
Component: engine
2016-11-13 11:17:18 -08:00
Harald Albers 6be217cc5f Add bash completion for docker service ps --all
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 188d2fac57d63888f08531adc46aa3349e3b4f3a
Component: engine
2016-11-13 09:32:53 -08:00
Doug Davis 0e5766bf8a Merge pull request #28359 from allencloud/fix-typo-in-node-update-docs
fix typo in node update docs
Upstream-commit: 3be885cd892ef5dc80318953244695f8f7df78a9
Component: engine
2016-11-13 10:41:09 -06:00
allencloud a1ee221aad fix typo in node update docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7bbbc8c7f16869dbb43e4e218ac280d5d1c0944a
Component: engine
2016-11-14 00:07:52 +08:00
Steve Durrheimer 64bd3d84d9 Add zsh completion for 'docker service {create --port, update --port-{add,rm}}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 36916ae2ad3709ec254d6c013fb5712820a898a7
Component: engine
2016-11-13 14:21:13 +01:00
Harald Albers 9a718bf5f4 Fix bash completion for docker ps --filter is-task
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7b6a38e1b1e146e4350db0e38d3d7a9313232ece
Component: engine
2016-11-13 04:54:54 -08:00
Steve Durrheimer b84e37a24c Add zsh completion for 'docker image build --cache-from'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ac50074258c0fef31ddc5c062ac5c07379b7cf78
Component: engine
2016-11-13 13:52:52 +01:00
allencloud ac2f27add0 judge manager before getting secret
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1addb4817bca8daeb3a3bca207705ad72f5c7a16
Component: engine
2016-11-13 12:52:09 +08:00
Harald Albers f3c74eec0d Add bash completion for docker build --cache-from
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c6357f04b5f30ac4d0e6712a05375013a8f7327e
Component: engine
2016-11-12 10:12:47 -08:00
Vincent Demeester 89b8c035b8 Merge pull request #28317 from tonistiigi/amd64-plugin-tests
Skip plugin tests if not in amd64
Upstream-commit: c8492ebc5db4fafb77bd1c8a0bcdf20f64597f3d
Component: engine
2016-11-12 13:52:42 +01:00
Vincent Demeester b5ceeb760a Merge pull request #28333 from chchliang/wordcode
`dont` spell error
Upstream-commit: 48339156448f3611b455a80098754163aa034e9e
Component: engine
2016-11-12 13:51:53 +01:00
chchliang 2967986572 don't spell error
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
Upstream-commit: 167f2f3f1bb4cf80abe1fbb4a090179a850363e3
Component: engine
2016-11-12 14:57:37 +08:00
yupeng 70633c7349 context.Context should be the first parameter of a function
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: aff5dacec190e8d94c6b796b06c773c8b1b223fe
Component: engine
2016-11-12 14:14:34 +08:00
Tõnis Tiigi d9c6d7e1df Merge pull request #28309 from LK4D4/fix_non_autogen
dockerversion: add other binaries to _lib.go
Upstream-commit: 851d9149b1e9d67811b227ed7cdf1fc6734ccdda
Component: engine
2016-11-11 15:39:00 -08:00
Brian Goff f7da4775d2 Merge pull request #28323 from Microsoft/jjh/typoinremoteapi1.25
Extra v1.25 in API docs
Upstream-commit: c03900ab3055b9d4868f5bdd61f062678b1eecde
Component: engine
2016-11-11 16:39:18 -05:00
John Howard 6ad57bc63a Extra v1.25 in API docs
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: beccd3663f3e377249fa5c07f62cbdbe5f3be14a
Component: engine
2016-11-11 12:50:05 -08:00
Vincent Demeester 38fe0f3c76 Merge pull request #28306 from ehazlett/service-create-no-secrets
only check secrets for service create if requested
Upstream-commit: 744d9dac10f3fb1ddbb54f6bea1cf9380e05891b
Component: engine
2016-11-11 20:58:40 +01:00
Tonis Tiigi e5cb7de38d Skip plugin tests if not in amd64
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e23e36f25cc55fd273fa04f2dd9d3772683ee381
Component: engine
2016-11-11 09:52:13 -08:00
Victor Vieux e9d1cb1940 Merge pull request #28042 from yongtang/28018-docker-info-swarm-managers
Add information for `Manager Addresses` in the output of `docker info`
Upstream-commit: 6f3720ca9e5e18cb0f6c36f89137cc294e2398b7
Component: engine
2016-11-11 09:30:01 -08:00
Victor Vieux 8ed32ee4ec Merge pull request #28274 from Microsoft/jjh/acl
Windows: create daemon root with ACL
Upstream-commit: 2712bb26e33eea46b69776b7b8aa6e18da0d3554
Component: engine
2016-11-11 09:20:32 -08:00
Antonio Murdaca 28fb705b0f Merge pull request #28307 from albers/completion-dockerd--seccomp-profile
Add bash completion for `docker daemon --seccomp-profile`
Upstream-commit: 0dfeeac206da2738fe36dcedabdefa0c5c042636
Component: engine
2016-11-11 17:42:11 +01:00
Tõnis Tiigi 4a96d47119 Merge pull request #28285 from vieux/try_arm_fix_libnetwor
update libnetwork to fix ARM tests
Upstream-commit: d06b1e2cc2fbeec4316885d0f403c96dd34b89d7
Component: engine
2016-11-11 08:32:29 -08:00
Brian Goff a346d7cb58 Merge pull request #27872 from vdemeester/images-filter-filters
Add reference filter and deprecated filter param…
Upstream-commit: de325535d4fe83f522e5daa78bdd8d4f9795513f
Component: engine
2016-11-11 11:24:19 -05:00
Kenfe-Mickael Laventure 9db7e23ff6 Remove extra binaries commit variables from windows build
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 17df5593ebcd471b0bbf0ea9d6e060ee3447850a
Component: engine
2016-11-11 08:24:17 -08:00
Kenfe-Mickael Laventure c69704a7d0 Fix version detection for docker-init
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 69f0402585579ced62bca22551a6ef45672bb4fd
Component: engine
2016-11-11 08:19:32 -08:00
Sebastiaan van Stijn bb992b4f94 Merge pull request #28297 from vdemeester/compose-swarm-openstdin
Add support for stdin_open in compose to swarm
Upstream-commit: e8469c0e63160174d00f60cdc2cc909593ab04b2
Component: engine
2016-11-11 17:09:04 +01:00
Alexander Morozov db5b472d68 dockerversion: add other binaries to _lib.go
Otherwise it's impossible to build without autogen tag

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e60e54c12aa65c3c11c27bda3002b361f2c1e90f
Component: engine
2016-11-11 07:56:10 -08:00
Yong Tang 16cd9213ef Add information for Manager Addresses in the output of docker info
As is specified in 28018, it would be useful to know the manager's addresses
even in a worker node. This is especially useful when there are many
worker nodes in a big cluster.

The information is available in `info.Swarm.RemoteManagers`.

This fix add the information of `Manager Addresses` to the output
of `docker info`, to explicitly show it.

A test has been added for this fix.

This fix fixes 28018.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 828bd441eb828072044175f3e6867c7218e434c5
Component: engine
2016-11-11 07:35:32 -08:00
Harald Albers f1763d3779 Add bash completion for docker daemon --seccomp-profile
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 98a2071696d51479fb4d162ace95a9857a8a8643
Component: engine
2016-11-11 16:12:17 +01:00
Evan Hazlett 1b38432db0 only check secrets for service create if requested
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 8dfdecbd2bf1c13e664a03b0c7c61ff391fb4fe1
Component: engine
2016-11-11 10:07:24 -05:00
Vincent Demeester e75f2fc3c8 Add reference filter and deprecated filter param…
… for `docker images`.

This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 820b809e70df8b9c7af00256182c48d935972a5c
Component: engine
2016-11-11 15:34:01 +01:00
Vincent Demeester 50bcf47873 Add support for extra_hosts in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f32869d956eb175f88fd0b16992d2377d8eae79c
Component: engine
2016-11-11 15:20:02 +01:00
Vincent Demeester e846f5ae11 Add support for stdin_open in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 84450b72cd73161449bae16b8ad0010fcc4a07eb
Component: engine
2016-11-11 15:19:00 +01:00
Vincent Demeester 45eb178352 Update swarmkit to efd44df04cc0fd828de5947263858c3a5a2729b1
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: bc739a8d70044263b1b71c28b8465fe2c84d3262
Component: engine
2016-11-11 15:18:34 +01:00
Brian Goff b02f8973b1 Merge pull request #28298 from vdemeester/compose-swarm-tty
Add support for tty in compose to swarm
Upstream-commit: 0bb6bac793af1cbdad7793fda7817323e435bf6c
Component: engine
2016-11-11 09:06:09 -05:00
Victor Vieux 79dfcbcb8d bump version to 1.14.0-dev
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 869242662b38244469d5192bb0980f42b3de2901
Component: engine
2016-11-11 02:28:13 -08:00
Victor Vieux ef8336e8b2 Merge pull request #28275 from vieux/1.13.0_changelog
add 1.13.0 CHANGELOG.md
Upstream-commit: 3c5e09f5e9c56bd6765ca65a98220f15fa46db78
Component: engine
2016-11-11 09:57:45 -08:00
Vincent Demeester 66e58fd23d Add support for tty in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: de15de6b4d90f8d707d92ab2f8b6a63e0742e8ce
Component: engine
2016-11-11 11:27:21 +01:00
Vincent Demeester 1eaec61ab6 Update compose-file to 8cff34df885ef07824138236bc4d27d359888b17
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f3dcae7dd36daf85de49af9f86145a9c5f5bd15a
Component: engine
2016-11-11 11:25:57 +01:00
Victor Vieux fac5d757e4 add 1.13.0 CHANGELOG.md
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 433bb525214db1359df18be280f555d915f7e386
Component: engine
2016-11-11 02:08:55 -08:00
Akihiro Suda 8f382a418c Update docs/deprecated.md for 1.13
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 6694974c9e3532cdaf5333b0a8b19f5ca64c70f0
Component: engine
2016-11-11 09:26:01 +00:00