Commit Graph
37584 Commits
Author SHA1 Message Date
Victor Vieux 4f68746145 Merge pull request #282 from albers/completion-daemon-updates
Updates to bash completion for `dockerd`
Upstream-commit: 42a31ff8c1
Component: cli
2017-07-04 16:42:10 +02:00
Victor Vieux e562168436 Merge pull request #285 from albers/completion-overlay2.size
Add bash completion for `dockerd --storage-opt overlay2.size`
Upstream-commit: d47bbb8358
Component: cli
2017-07-04 16:41:35 +02:00
Victor Vieux d2b6d249be Merge pull request #243 from vieux/scale2
add `--detach` to docker scale 
Upstream-commit: 43fb4a4547
Component: cli
2017-07-04 16:36:59 +02:00
Victor Vieux 08a00684a2 Merge pull request #33944 from cpuguy83/fix_wrong_dirname
Fix plugin remove dir name after rename.
Upstream-commit: 82c2a08b6018586f3c8f35405c3bd6fce3c78ccd
Component: engine
2017-07-04 16:12:39 +02:00
Vincent Demeester ec1ee882b3 Merge pull request #33322 from jsoref/spelling
Spelling
Upstream-commit: ff4f700f74450018f36d014f3cde0ff1b9c17fb3
Component: engine
2017-07-04 15:46:34 +02:00
Harald Albers 460a63fa01 Add bash completion for dockerd --metrics-addr
`--metrics-addr` does not accept network interface names.
Therefore `__docker_local_interfaces` was refined for this feature to
optionally exclude interface names.

Note that although `--metrics-addr` is experimental, it cannot be
selectively enabled in bash completion because the test for the daemon
running in experimental mode requires a running daemon. As this
completion pertains to starting the daemon, this requirement is not met.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0ea31afd57
Component: cli
2017-07-04 14:40:22 +02:00
Brian Goff b4c3d928eb Fix plugin remove dir name after rename.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4bf263c19873718394f8161dbc020bf4be30f9d6
Component: engine
2017-07-04 07:37:26 -04:00
Vincent Demeester f186d3c42f Merge pull request #289 from mstanleyjones/multiple-env
Provide examples for multiple uses of the same flag
Upstream-commit: 357ff50fa9
Component: cli
2017-07-04 12:48:20 +02:00
Sebastiaan van Stijn e720e150d4 Add missing API documentatoin for DataPathAddr
COmmit 0307fe1a0bcdc02583a24add41eb783c117bad8c added
a new `DataPathAddr` property to the swarm/init and swarm/join
endpoints. This property was not yet added to the
documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c79c16910c0f3d6e88f2dc6ef609ecc3b02ccef9
Component: engine
2017-07-04 03:11:40 -07:00
Sebastiaan van Stijn 72c6de1018 Merge pull request #292 from thaJeztah/clarify-docker-go-package
Clarify docker/go package
Upstream-commit: 8df4cd1edc
Component: cli
2017-07-03 23:44:26 -07:00
Sebastiaan van Stijn e194cd1eb4 Merge pull request #290 from mstanleyjones/d-and-rm-flags
Clarify that you can use -d and --rm together now
Upstream-commit: 98b7dbe908
Component: cli
2017-07-03 23:43:36 -07:00
Andrew Hsu c966fe9e08 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-07-04 05:59:51 +00:00
Andrew Hsu 4ca82b695b Merge pull request #28 from thaJeztah/fix-contrib-paths
Fix paths for completion scripts
Upstream-commit: 7416a7521a6ad21c7925237230d26855c76b222f
Component: packaging
2017-07-03 22:57:12 -07:00
Sebastiaan van Stijn f2ec8286bb Merge pull request #33494 from cpuguy83/document_stream_format_in_client_lib
Add stream format details for attach/logs endpoint
Upstream-commit: a9358df62cde2deb8184c742e6fb8d16c98a04a9
Component: engine
2017-07-03 22:02:24 -07:00
Tibor Vass bfb65fa0bb Merge pull request #33830 from cpuguy83/33799_fix_plugin_mounts_issue
Make plugin removes more resilient to failure
Upstream-commit: 48adb9d9549b8e5c4e9fd34335161c7676395e5a
Component: engine
2017-07-03 18:37:31 -07:00
Sebastiaan van Stijn e415e09501 Clarify docker/go package
This package is used by Notary. Add a comment to
the vendor.conf file to explain what it contains
and what it's used for.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 60fe70c900
Component: cli
2017-07-03 18:00:46 -07:00
Misty Stanley-Jones 9e2f4854f6 Clarify that you can use -d and --rm together now
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: c63485b47d
Component: cli
2017-07-03 16:43:41 -07:00
Misty Stanley-Jones 017354f791 Provide examples for multiple uses of the same flag
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: ef61582591
Component: cli
2017-07-03 16:21:28 -07:00
Sebastiaan van Stijn ca1a24c1df Bump go-winio to 0.4.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8a3c89b409
Component: cli
2017-07-03 14:37:56 -07:00
Sebastiaan van Stijn 3fea46b7b2 Merge pull request #33884 from aaronlehmann/redact-secret-payload
middleware: Redact secret data on "secret create"
Upstream-commit: b9f248d0ea9f7ec4e0325c7034038319c70c2dda
Component: engine
2017-07-03 14:18:32 -07:00
Brian Goff 63c7ce310a Merge pull request #33213 from gkze/master
GCP Logs: send log text as jsonPayload.message instead of jsonPayload.data
Upstream-commit: c2ad549533cf2ffdb8b93ce8eb0bad5c695b828c
Component: engine
2017-07-03 16:18:18 -04:00
Josh Soref 643654c2f0 Spelling fixes
* additional
* ambiguous
* anonymous
* anything
* application
* because
* before
* building
* capabilities
* circumstances
* commit
* committer
* compresses
* concatenated
* config
* container
* container's
* current
* definition
* delimiter
* disassociates
* discovery
* distributed
* doesnotexist
* downloads
* duplicates
* either
* enhancing
* enumerate
* escapable
* exactly
* expect
* expectations
* expected
* explicitly
* false
* filesystem
* following
* forbidden
* git with
* healthcheck
* ignore
* independent
* inheritance
* investigating
* irrelevant
* it
* logging
* looking
* membership
* mimic
* minimum
* modify
* mountpoint
* multiline
* notifier
* outputting
* outside
* overridden
* override
* parsable
* plugins
* precedence
* propagation
* provided
* provides
* registries
* repositories
* returning
* settings
* should
* signals
* someone
* something
* specifically
* successfully
* synchronize
* they've
* thinking
* uninitialized
* unintentionally
* unmarshaling
* unnamed
* unreferenced
* verify

Signed-off-by: Josh Soref <jsoref@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 39bcaee47b8a284a46b761afe218ba7deda0d482
Component: engine
2017-07-03 13:13:09 -07:00
Sebastiaan van Stijn 2040dca50c Merge pull request #33405 from jsoref/gofmt
gofmt: 5 files
Upstream-commit: acd20d8a8ea6fe7d00e10d4946cc68c7162355bc
Component: engine
2017-07-03 13:06:10 -07:00
Brian Goff d174953fec Merge pull request #33843 from moypray/exit
Set unpaused state when receiving 'stateExit' event
Upstream-commit: f8f1a3ade97bf5c9fd96836e9a436b19ef5ac660
Component: engine
2017-07-03 16:02:18 -04:00
Andrew Hsu ef3fca8458 Merge component 'engine' from git@github.com:moby/moby master 2017-07-03 19:12:09 +00:00
Andrew Hsu d49a090a5e Merge component 'cli' from git@github.com:docker/cli master 2017-07-03 18:51:34 +00:00
Sebastiaan van Stijn d7aea54f11 Use v1.0.0 tag for go-difflib
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 42d83d20c9
Component: cli
2017-07-03 11:42:28 -07:00
Michael Crosby 654d76c922 Do not set -1 for swappiness
Do not set a default value for swappiness as the default value should be
`nil`

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 9d87e6e0fb799d6ef3bb9a97bc523f8d343b5fb3
Component: engine
2017-07-03 11:23:15 -07:00
Josh Soref c2eb21415c gofmt: 5 files
gofmt from go1.8.3

hg locate '*.go' |xargs ~/go/bin/gofmt -s -w

Signed-off-by: Josh Soref <jsoref@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6284cf5e9a4bc121b73422c454cdbf8dc18f42f3
Component: engine
2017-07-03 10:32:47 -07:00
Aleksa Sarai 666b2cc734 devicemapper: add --storage-opt dm.libdm_log_level=X option
Because we use our own logging callbacks in order to use libdm
effectively, it is quite difficult to debug complicated devicemapper
issues (because any warnings or notices from libdm are muted by our own
callback function). e07d3cd9a ("devmapper: Fix libdm logging") further
reduced the ability of this debugging by only allowing _LOG_FATAL errors
to be passed to the output.

Unfortunately libdm is very chatty, so in order to avoid making the logs
even more crowded, add a dm.libdm_log_level storage option that allows
people who are debugging the lovely world of libdm to be able to dive in
without recompiling binaries.

The valid values of dm.libdm_log_level map directly to the libdm logging
levels, and are in the range [2,7] as of the time of writing with 7
being _LOG_DEBUG and 2 being _LOG_FATAL. The default is _LOG_FATAL.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: 198f83bba120c6c9bda679d33a55acab6cc9f33d
Component: engine
2017-07-04 02:04:26 +10:00
Aleksa Sarai 00264ebf6b devicemapper: change LogInit and move all callbacks to pkg
LogInit used to act as a manual way of registering the *necessary*
pkg/devicemapper logging callbacks. In addition, it was used to split up
the logic of pkg/devicemapper into daemon/graphdriver/devmapper (such
that some things were logged from libdm).

The manual aspect of this API was completely non-sensical and was just
begging for incorrect usage of pkg/devicemapper, so remove that semantic
and always register our own libdm callbacks.

In addition, recombine the split out logging callbacks into
pkg/devicemapper so that the default logger is local to the library and
also shown to be the recommended logger. This makes the code
substantially easier to read. Also the new DefaultLogger now has
configurable upper-bound for the log level, which allows for dynamically
changing the logging level.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: cfd39e8d6d79eee8a71fbe6820dd67babf05d951
Component: engine
2017-07-04 02:04:26 +10:00
Aleksa Sarai 01199b4ca4 devicemapper: actually remove DmLogInitVerbose
e07d3cd9a ("devmapper: Fix libdm logging") removed all of the callers of
DmLogInitVerbose, but we still kept around the wrapper. However, the
libdm dm_log_init_verbose API changes the verbosity of the *default*
libdm logger. Because pkg/devicemapper internally *relies* on using
logging callbacks to understand what errors were encountered by libdm,
this wrapper is useless (it only makes sense for the default logger
which we do not user).

Any user not inside Docker of this function almost certainly was not
using this API correctly, because pkg/devicemapper will misbehave if our
logging callbacks were not registered.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: c654147f0635736fff0035ecdfa53a41c7fad0d0
Component: engine
2017-07-04 02:04:26 +10:00
Aleksa Sarai 9421df98fb devicemapper: remove 256 character limit of libdm logs
This limit is unecessary and can lead to the truncation of long libdm
logs (which is quite annoying).

Fixes: b440ec013 ("device-mapper: Move all devicemapper spew to log through utils.Debugf().")
Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: 63328c6882c3d1f54c66499ef9963adfbf1883f0
Component: engine
2017-07-04 02:04:26 +10:00
Harald Albers dff3d848de Add bash completion for dockerd --storage-opt overlay2.size
This adds bash completion for
- https://github.com/docker/cli/pull/215
- https://github.com/moby/moby/pull/32977

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a4b1769bb6
Component: cli
2017-07-03 18:03:00 +02:00
Victor Vieux a2a898edc8 Merge pull request #33899 from cyphar/make-dynbinary
make: add dynbinary target
Upstream-commit: 8bc681262f970b243cb5e9796c47ecd8d6b6aabf
Component: engine
2017-07-03 17:50:20 +02:00
Victor Vieux b0ff0a2e4a Merge pull request #33888 from thaJeztah/enable-version-negotiation
Always perform version-negotiation
Upstream-commit: 75a034621d715bf01069cc3f7bab0cce85fa744c
Component: engine
2017-07-03 17:46:35 +02:00
Victor Vieux 955a71e569 Merge pull request #33926 from coolljt0725/fix_wrong_file_mode
Fix wrong filemode for rotate log files
Upstream-commit: d061ad4a1b3b029e4afa042c1eaf707037562e8c
Component: engine
2017-07-03 17:45:14 +02:00
Vincent Demeester bd2899d4b2 Merge pull request #33908 from thaJeztah/carry-33883-ignore-nonexistent-containers
[carry 33883] daemon: Ignore nonexistent containers when listing containers
Upstream-commit: cab50de4d682890187b48984e0c81b98cb69ed4f
Component: engine
2017-07-03 17:06:54 +02:00
Vincent Demeester c914e1a6cd Merge pull request #213 from dnephin/improve-swarm-ca-cmd
Refactor and UI changes to `swarm ca` command
Upstream-commit: 85b41c3e71
Component: cli
2017-07-03 17:02:45 +02:00
Tycho Andersen f4b9a413f3 login: print a big warning when using --password
Task command lines are world readable via /proc/pid/cmdline, so this isn't
safe.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Upstream-commit: c269ad26e8
Component: cli
2017-07-03 08:47:20 -06:00
Harald Albers 3abe1e3a95 Add bash completion for dockerd --cpu-rt-(period|runtime)
This adds bash completion for https://github.com/moby/moby/pull/23430.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 74a5d1af86
Component: cli
2017-07-03 13:55:46 +02:00
Harald Albers 67ccad49a6 Add bash completion for dockerd --default-runtime
`--default-runtime` was added in https://github.com/moby/moby/pull/22983

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d610951e85
Component: cli
2017-07-03 13:44:23 +02:00
Victor Vieux 0b37ceed6f scale all services at once
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 58d3fc24b1
Component: cli
2017-07-03 13:40:54 +02:00
Harald Albers 523bbfaf9d Add bash completion for dockerd --no-new-privileges
This adds bash completion for https://github.com/moby/moby/pull/32944.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 112348d4db
Component: cli
2017-07-03 13:33:01 +02:00
Harald Albers bea84311a0 Add bash completion for dockerd --version
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5296907bef
Component: cli
2017-07-03 13:32:29 +02:00
Harald Albers 167d48d341 Add bash completion for dockerd --swarm-default-advertise-addr
This adds bash completion for https://github.com/moby/moby/pull/24237.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cf3ffc516b
Component: cli
2017-07-03 13:09:43 +02:00
Wentao Zhang f8f582f303 Set unpasued state when receiving 'stateExit' event
Description:
 1. start a container with restart=always.
    `docker run -d --restart=always ubuntu sleep 3`
 2. container init process exits.
 3. use `docker pause <id>` to pause this container.

if the pause action is before cgroup data is removed and after the init process died.
`Pause` operation will success to write cgroup data, but actually do not freeze any process.

And then docker received pause event and stateExit event from
containerd, the docker state will be Running(paused), but the container
is free running.

Then we can not remove it, stop it , pause it  and unpause it.

Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com>
Upstream-commit: fe1b4cfba6320793373c5397641d743d9fe94cf8
Component: engine
2017-07-03 17:26:13 +08:00
Victor Vieux 0257839dba Merge pull request #33853 from vieux/report-2017-06-26
Moby Dev Report 2017 06 26
Upstream-commit: 714c226b431c73efa43373fb7a284408b709c80f
Component: engine
2017-07-03 11:18:11 +02:00
Lei Jitang 3a59ac4d9f Fix wrong filemode for rotate log files
the filemode should be 0640 but not 06400

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 96ea8eaa1592856e0829c3465e64f93911d3e389
Component: engine
2017-07-03 03:49:22 -04:00
Sebastiaan van Stijn 155031dfee Merge pull request #33920 from thaJeztah/remove-fork-message
Remove comment about forked golang.org/x/net
Upstream-commit: 7117d5ef25b54c3384fbaf5cf279e0dcc6701a52
Component: engine
2017-07-02 00:29:30 -07:00