Commit Graph
36672 Commits
Author SHA1 Message Date
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
Vincent Demeester d376a5b12b Merge pull request #28330 from YuPengZTE/devCtx
context.Context should be the first parameter of a function
Upstream-commit: eb131c5383db8cac633919f82abad86c99bffbe5
Component: engine
2016-11-12 13:18:17 +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 f1ed942575 context.Context should be the first parameter of a function
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 0f6af2074c
Component: cli
2016-11-12 14:14:34 +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
Aaron Lehmann 37bec9cc07 cli: Add valid suffixes for remaining duration options
A recent PR added `(ns|us|ms|s|m|h)` to the descriptions of some
duration options, but not all. Add it to the remaining options for
consistency.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 32b12a28fcab98b79c9176fb78b5620a46906916
Component: engine
2016-11-11 17:44:42 -08:00
Aaron Lehmann 85c67043dc cli: Add valid suffixes for remaining duration options
A recent PR added `(ns|us|ms|s|m|h)` to the descriptions of some
duration options, but not all. Add it to the remaining options for
consistency.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 7e7c4eefa4
Component: cli
2016-11-11 17:44:42 -08:00
John Stephens c6c57b1d27 Show experimental flags and subcommands if enabled
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 13d6a1bb67
Component: cli
2016-11-11 17:43:06 -08:00
John Stephens aac63267fa Show experimental flags and subcommands if enabled
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: d67aa065ef9f295949ed507fc3d67f29fd56fcdb
Component: engine
2016-11-11 17:43:06 -08:00
John Howard d1393049a2 Planned 1.13 deprecation: email from login
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4088f3bcff
Component: cli
2016-11-11 17:32:46 -08:00
John Howard aa871fbd88 Planned 1.13 deprecation: email from login
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a66efbddb8eaa837cf42aae20b76c08274271dcf
Component: engine
2016-11-11 17:32:46 -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 0a49dfc297 Merge pull request #28306 from ehazlett/service-create-no-secrets
only check secrets for service create if requested
Upstream-commit: 827b121154
Component: cli
2016-11-11 20:58:40 +01: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
Victor Vieux 1c7876140d Merge pull request #28318 from vieux/bump_version
bump version to 1.14.0-dev
Upstream-commit: 6a747fcf57aad5d013d250013ad8ac4bfc18b0a9
Component: engine
2016-11-11 10:29:15 -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
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 ed0d9295fd Merge pull request #28042 from yongtang/28018-docker-info-swarm-managers
Add information for `Manager Addresses` in the output of `docker info`
Upstream-commit: 460a7e213c
Component: cli
2016-11-11 09:30:01 -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 a3bd1bfe20 Merge pull request #27872 from vdemeester/images-filter-filters
Add reference filter and deprecated filter param…
Upstream-commit: 356ff43768
Component: cli
2016-11-11 11:24:19 -05: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 d39fb19105 Merge pull request #28297 from vdemeester/compose-swarm-openstdin
Add support for stdin_open in compose to swarm
Upstream-commit: 57da27f76c
Component: cli
2016-11-11 17:09:04 +01: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
Brian Goff b09ce8ab95 Merge pull request #28299 from vdemeester/compose-swarm-extra_hosts
Add support for extra_hosts in compose to swarm
Upstream-commit: e0280c568aa8055d7179afd5928d000726136bed
Component: engine
2016-11-11 10:54:53 -05:00
Yong Tang cf7711be4d 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: cd71257cfd
Component: cli
2016-11-11 07:35:32 -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 ea03f9e605 only check secrets for service create if requested
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 885c5f1747
Component: cli
2016-11-11 10:07:24 -05: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 608f23172f 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: 85e72de60c
Component: cli
2016-11-11 15:34:01 +01:00
Vincent Demeester d6a4ee3c7d 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: 3c61af0f76
Component: cli
2016-11-11 15:34:01 +01: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 a03dcc83b4 Add support for extra_hosts in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 84a795bf05
Component: cli
2016-11-11 15:20:02 +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 03ba4d6a33 Add support for stdin_open in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f24ff647e1
Component: cli
2016-11-11 15:19:00 +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
Vincent Demeester ade3f0003f Merge pull request #28293 from AkihiroSuda/update-deprecate-md
[doc] Update docs/deprecated.md for 1.13
Upstream-commit: 58c040607600699db7bdf5c13ac5ba8a7f44fa7d
Component: engine
2016-11-11 13:48:14 +01:00
Ian Campbell 4e45b185f6 pkg/jsonmessage: Encode ANSI ESC directly as \x1b rather than via fmt as %c
This seems clearer to me and avoids a miniscule amount of string formatting.

I have deliberately not changed the tests here to avoid the possibility of
changing both wrongly.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: 3c233b13a01b9f44e31a158768a06b97a775f095
Component: engine
2016-11-11 11:42:38 +00:00
Ian Campbell d23f15cd3f pkg/jsonmessage: Use terminfo rather than open coding ANSI escape codes
Although our use of ANSI codes here is rather simple it is generally good
practice to use terminfo in order to be portable to different terminal
emulators.

Vendor github.com/Nvveen/Gotty (actually my fork with a fix, see
https://github.com/Nvveen/Gotty/pull/1) and use that to parse the terminfo
files.

Note that "\e]2K" (clear entire line) is not covered by terminfo. We can
achieve the same end by first clearing from begining of line to cursor
(el1="\e]1K") and then clearing from cursor to end of line (el="\e]k").

Test suite has been updated and forces (either directly or by setting $TERM to
something highly unlikely to exist) the use of the non-terminfo fallbacks which
retains the same output behaviour as previously. This is preferable even to
relying on a well-known and relatively static terminfo (like vt102) since even
that in principal might have different terminfo encodings.

In case terminfo is not available at all for $TERM or doesn't expose the
specific capabilities which we use then fall back to the previous manual
escapes, with the exception that we avoid "\e]2K" as discussed above.

Tested with a manual docker pull with rxvt-unicode ($TERM=rxvt-unicode), xterm
($TERM=xterm), mlterm ($TERM=mlterm) and aterm ($TERM=kterm).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: f02221a7941948017df68db8fd9a5de7f19453bf
Component: engine
2016-11-11 11:40:53 +00:00