Commit graph

30686 commits

Author SHA1 Message Date
Harald Albers
5a067e5255 Use native call for listing plugins in bash completion
`docker plugin ls` now has `--format`, so there is no more need for
postprocessing raw `docker plugin ls` output with `awk` any more.
This will make generation of plugin lists robust against changes
in `docker plugin ls` output.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-26 17:33:43 +01:00
Daniel Nephin
b4f23bbc69 Rebase Compose v3.1 schema on the latest v3 schema.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin
f0a5531c46 Remove secrets as part of stack remove.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin
b3427e43ed Test and fix external secrets in stack deploy.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin
6ec84ef76d Add integration test for stack deploy with secrets.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin
9419e7df2b Implement secret types for compose file.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin
65374488f9 Add v3.1 schema and support validating multiple version.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Kenfe-Mickael Laventure
fc2fc6565a Add example for device-cgroup-rule to man
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-26 07:21:50 -08:00
Kenfe-Mickael Laventure
98e7ec8e17 Update cobra to v1.5.1
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-26 07:21:50 -08:00
Kenfe-Mickael Laventure
1756af6faf Allow adding rules to cgroup devices.allow on container create/run
This introduce a new `--device-cgroup-rule` flag that allow a user to
add one or more entry to the container cgroup device `devices.allow`

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-26 07:20:45 -08:00
Lars-Magnus Skog
9c98bffc2b update api docs on Placement.Constraints for services
Signed-off-by: Lars-Magnus Skog <ralphtheninja@riseup.net>
2017-01-26 15:01:21 +01:00
Sebastiaan van Stijn
fe5f49685d Merge pull request #30111 from darrenstahlmsft/DependsConDrv
Windows: Add service dependency ConDrv
2017-01-26 12:49:05 +01:00
Sebastiaan van Stijn
bc18cfa3f3 Merge pull request #28921 from allencloud/remove-incorrect-url
update an incorrect url in docs
2017-01-26 10:29:12 +01:00
allencloud
5ae95d6245 update incorrect url in docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-26 12:57:45 +08:00
Harald Albers
93e43b42be Rename helper function in bash completion for consistency
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-25 15:55:04 -08:00
Harald Albers
fceaae95b5 Hide bash completion for docker run|create|build --isolation on non-windows
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-25 15:55:04 -08:00
Kenfe-Mickaël Laventure
db657a558e Merge pull request #30376 from albers/completion-fix-node-list
Fix bash completion for completing nodes
2017-01-25 11:52:13 -08:00
Yong Tang
05a831a775 Fix incorrect Scope in network ls/inspect with duplicate network names
This fix tries to address the issue raised in 30242 where the `Scope`
field always changed to `swarm` in the ouput of `docker network ls/inspect`
when duplicate networks name exist.

The reason for the issue was that `buildNetworkResource()` use network name
(which may not be unique) to check for the scope.

This fix fixes the issue by always use network ID in `buildNetworkResource()`.

A test has been added. The test fails before the fix and passes after the fix.

This fix fixes 30242.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-25 09:39:55 -08:00
Alexander Morozov
a76572b846 Merge pull request #30330 from mlaventure/prune-named-untagged
Prune named but untagged images if danglingOnly=true
2017-01-25 08:38:15 -08:00
Andy Goldstein
76f58d7294 journald logs: drain 1 more time at container exit
In the journald log driver, attempt to drain the journal 1 more time
after being told to stop following the log. Due to a possible race
condition, sometimes data is written to the journal at almost the same
time the log watch is closed, and depending on the order of operations,
sometimes you miss the last journal entry.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
2017-01-25 09:29:21 -05:00
Harald Albers
926fa56c0d Add bash completion for docker checkpoint
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-25 12:55:56 +01:00
Harald Albers
f2ee29ed96 Add windows specific bash completion for docker run|create
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-25 10:24:27 +01:00
Aaron Lehmann
e9c0de0de6 Merge pull request #30043 from dmcgowan/distribution-reference-update-1
Distribution reference update
2017-01-24 20:38:20 -08:00
Sebastiaan van Stijn
d4cd4b2164 Merge pull request #30182 from AkihiroSuda/validate-tmpfs
validate mount path for tmpfs
2017-01-25 03:08:17 +01:00
Victor Vieux
42d25de1b7 Merge pull request #30291 from yongtang/30279-ps-format
Fix failure in `docker ps --format` when `.Label` has args
2017-01-24 17:55:52 -08:00
Sebastiaan van Stijn
9b2dabbf18 Merge pull request #30227 from thaJeztah/fix-ineffectual-assignments
fix some ineffectual assignments (and minor fixes)
2017-01-25 02:49:57 +01:00
Victor Vieux
113e9f07f4 Merge pull request #30408 from cpuguy83/fix_plugin_wait
Fix deadlock on v1 plugin with activate error
2017-01-24 17:29:56 -08:00
Victor Vieux
4726fd1203 Merge pull request #30325 from dnephin/add-internal-to-compose-network
Add network.internal to Compose schema
2017-01-24 17:16:08 -08:00
Aaron Lehmann
3c82a9bc27 Merge pull request #30206 from coolljt0725/fix_save_share_layers
Follow #28926, fix docker save can't share layers in the tar archive.
2017-01-24 16:28:11 -08:00
Brian Goff
f07f54951f Merge pull request #30269 from sdurrheimer/zsh-completion-service-ps-multi
Add zsh completion for multiple service for 'docker service ps'
2017-01-24 16:33:30 -05:00
Kenfe-Mickaël Laventure
5e74dc11e3 Merge pull request #30391 from andrewhsu/check-changelog-date
validate CHANGELOG.md dates are in descending order
2017-01-24 11:18:21 -08:00
Michael Crosby
b13ecbc7b5 Merge pull request #30283 from albers/completion-run--init-path
Add bash completion and docs for `docker run|create --init-path`
2017-01-24 10:06:44 -08:00
Vincent Demeester
f645ffca04 Merge pull request #30413 from thaJeztah/minor-godocs-fixup
Minor GoDoc fixup in integration-cli
2017-01-24 18:08:27 +01:00
Sebastiaan van Stijn
089e1c1c5b Minor GoDoc fixup in integration-cli
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 18:03:30 +01:00
Sebastiaan van Stijn
37a1a84d91
do not ignore local build-contexts starting with "github.com"
Docker special-cases build-contexts starting with `github.com`, and
treats them as remote URLs.

Because of this special treatment, local build contexts in a directory
named "github.com" are ignored by `docker build`.

This patch changes the way the build-context is detected and first
checks if a local path with the given name exists before considering
it to be a remote URL.

Before this change;

    $ mkdir -p github.com/foo/bar && echo -e "FROM scratch\nLABEL iam=local" > github.com/foo/bar/Dockerfile

    $ docker build -t dont-ignore-me github.com/foo/bar
    Username for 'https://github.com':

After this change;

    $ mkdir -p github.com/foo/bar && echo -e "FROM scratch\nLABEL iam=local" > github.com/foo/bar/Dockerfile

    $ docker build -t dont-ignore-me github.com/foo/bar
    Sending build context to Docker daemon 2.048 kB
    Step 1/2 : FROM scratch
     --->
    Step 2/2 : LABEL iam local
     ---> Using cache
     ---> ae2c603fe970
    Successfully built ae2c603fe970

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 17:44:44 +01:00
Brian Goff
f2d384fca6 Fix deadlock on v1 plugin with activate error
When a plugin has an activation error, it was not being checked in the
`waitActive` loop. This means it will just wait forever for a manifest
to be populated even though it may never come.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-24 11:08:13 -05:00
Brian Goff
34d0619074 Merge pull request #30268 from sdurrheimer/zsh-completion-plugin-install-alias
Add zsh completion for 'docker plugin install --alias'
2017-01-24 10:08:57 -05:00
Brian Goff
aa180e5f31 Merge pull request #30399 from albers/completion-swarm-lock
Add bash completion for `docker swarm unlock|unlock-key`
2017-01-24 09:43:07 -05:00
Sebastiaan van Stijn
950658bbb6
Add "src" alias for --secret
This patch adds a "src" alias for `--secret`
to be consistent with `--mount`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 15:41:45 +01:00
Brian Goff
3bc021cdf3 Merge pull request #30398 from albers/completion-swarm-init
Add missing options to bash completion for `docker swarm init|update`
2017-01-24 09:41:30 -05:00
Brian Goff
47da8175be Merge pull request #30373 from albers/completion-fix-service-update
Fix bash completion for `docker service update`
2017-01-24 09:31:53 -05:00
Brian Goff
ee7682ebae Merge pull request #30378 from mlaventure/fix-negative-size
Ensure proper value is used when computing reclaimable space
2017-01-24 09:24:53 -05:00
Vincent Demeester
23341a41a5 Merge pull request #30394 from aboch/nl
Vendor vishvananda/netlink @ebdfb74
2017-01-24 15:24:07 +01:00
Vincent Demeester
d417dd7886 Merge pull request #30248 from albers/completion-capabilities
Improve bash completion for `docker run --cap-{add,drop}`
2017-01-24 12:10:14 +01:00
Sebastiaan van Stijn
d1f7798c60 Merge pull request #30370 from mikesir87/master
Fixed secret creation usage during service create in docs
2017-01-24 11:55:09 +01:00
Sebastiaan van Stijn
de1a403810 Merge pull request #30387 from coolljt0725/fix_typo
typo: fix typo in api documents
2017-01-24 11:46:44 +01:00
Vincent Demeester
bb9f7cb280 Merge pull request #30371 from albers/completion-fix-plugin-ls
Fix bash completion for `docker plugin ls`
2017-01-24 11:46:13 +01:00
Sebastiaan van Stijn
ba0afd70e8 fix some ineffectual assignments
to make goreportcard a bit happier
https://goreportcard.com/report/github.com/docker/docker

also found that `TestCpToErrDstParentNotExists()` was
partially broken, because a `runDockerCp()` was inadvertently
removed in f26a31e80c

`TestDaemonRestartSaveContainerExitCode()` didn't verify
the actual _Error_ message, so added that to the test,
and updated the test to take into account that the
"experimental" CI enables `--init` on containers.

`TestVolumeCLICreateOptionConflict()` only checked
for an error to occur, but didn't validate if the
error was due to conflicting options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 11:16:19 +01:00
Sebastiaan van Stijn
8820266c17 Merge pull request #29900 from yongtang/29226-network-format-created-at
Add `.CreatedAt` placeholder for `docker network ls --format`
2017-01-24 11:01:37 +01:00
Vincent Demeester
ac30c4c06c Merge pull request #30385 from aaronlehmann/vendor-swarmkit-grpc-containerd
Vendor swarmkit, containerd, and related dependencies
2017-01-24 11:00:35 +01:00