Commit Graph

4426 Commits

Author SHA1 Message Date
2e782847eb Add unit tests for initializing the client.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 930f97dd09
Component: cli
2017-08-18 12:49:23 -04:00
3f532263bf Merge pull request #455 from shin-/prevent_invalid_resources
Update schemas to prevent invalid properties in deploy.resources
Upstream-commit: a8a3ffa8ef
Component: cli
2017-08-18 11:42:39 -04:00
6092fc343f Update schemas to prevent invalid properties in deploy.resources
Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: 1667073908
Component: cli
2017-08-17 15:58:51 -07:00
04e18204b0 Merge pull request #449 from dnephin/use-gotestyourself
Remove dependency on (most of) docker/docker/pkg/testutil
Upstream-commit: e57842edb8
Component: cli
2017-08-17 12:37:18 -07:00
a6a08902d2 Merge pull request #448 from thaJeztah/fix-typo
Fix typo and minor Markdown edits
Upstream-commit: 070d0811e3
Component: cli
2017-08-17 19:59:55 +02:00
7048b7f056 Fix typo and minor Markdown edits
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9544b70cb3
Component: cli
2017-08-17 02:29:24 +02:00
ef0d9067ae Merge pull request #447 from thaJeztah/fix-liquid-warning
Fix "liquid" warning on logging plugins page
Upstream-commit: 799de1dae2
Component: cli
2017-08-17 02:27:34 +02:00
0d15a1c160 Fix "liquid" warning on logging plugins page
Noticed this warning in the documentation CI:

    Liquid Warning: Liquid syntax error (line 210): Expected end_of_string but found id in "{{ log stream }}" in engine/extend/plugins_logging.md

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d30987f85f
Component: cli
2017-08-17 00:56:54 +02:00
e7d8c55034 Merge pull request #446 from krizalys/fix-grammar
Fixed grammar
Upstream-commit: 3e831e4472
Component: cli
2017-08-16 23:20:31 +02:00
55bd0229fa Replace pkg/testutil/tempfile with gotestyourself/fs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 15837afa77
Component: cli
2017-08-16 14:23:28 -04:00
34fe016d0d Update volume command tests to use the new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 505a0fe45f
Component: cli
2017-08-16 14:23:28 -04:00
a5b8c46809 Update swarm command tests to use the new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3d68aa8416
Component: cli
2017-08-16 14:23:28 -04:00
38bd6cfe47 Update stack and task command tests to new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1dd742eac8
Component: cli
2017-08-16 14:23:28 -04:00
2c6a1a2476 Update service and secret command tests to new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4c62d7288f
Component: cli
2017-08-16 14:23:28 -04:00
79c79c9b8f Update node command tests to the new golden
Also remove some superfluous tests that are now covered by a strict golden.Assert

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0e2bf7420a
Component: cli
2017-08-16 14:23:15 -04:00
c06d7f05e3 Update image command tests to use the new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 75f7bfedf8
Component: cli
2017-08-16 14:20:36 -04:00
5a6dec9ec1 Update config and checkpoint commands to use gotestyourself/golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f9007ad7db
Component: cli
2017-08-16 14:19:00 -04:00
3b7026d84c Add gotestyourself dependency.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 882992c6fc
Component: cli
2017-08-16 14:08:08 -04:00
457a3de5d9 Updated & reformulated kinds of mounts section
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
Upstream-commit: 9c4b9c6f63
Component: cli
2017-08-17 00:51:35 +07:00
095929f4ed Merge pull request #444 from dnephin/faster-validate-ci
Don't sleep in CI
Upstream-commit: 17adcbdada
Component: cli
2017-08-16 13:45:44 +02:00
8ae99115c1 Merge pull request #443 from dnephin/ignore-codecov-upload-fail
Ignore codecov upload failures in CI
Upstream-commit: 35c60bbd9b
Component: cli
2017-08-15 13:05:43 -07:00
b4e14f104b Set DISABLE_WARN_OUTSIDE_CONTAINER in the Dockerfile so that we don't spend 10s sleeping in CI
also add time to validate check

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 058733969c
Component: cli
2017-08-15 14:34:43 -04:00
750260f43f Ignore codecov upload failures in CI.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4e09dba068
Component: cli
2017-08-15 14:34:43 -04:00
850fb084cc Merge pull request #430 from dnephin/add-build-target-to-compose
Add network and target to build in v3.4
Upstream-commit: 04659b8802
Component: cli
2017-08-15 19:20:49 +02:00
e3f190dc00 Ignore codecov upload failures in CI.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6a7dc459dd
Component: cli
2017-08-15 13:17:20 -04:00
a3ff59d2d3 Merge pull request #354 from dnephin/warn-outside-container
Add a warning when make is run outside of a container
Upstream-commit: 703a7cca2b
Component: cli
2017-08-14 14:10:12 -04:00
133a5fd166 Merge pull request #436 from thaJeztah/improve-singular-plural-message
Singularize / pluralize "argument(s)" in error message
Upstream-commit: 3b8cf20a0c
Component: cli
2017-08-14 11:06:25 -04:00
2d6cf733e9 Merge pull request #438 from ripcurld0/history_fix
Print timestamp when --human=true
Upstream-commit: 898f1e2997
Component: cli
2017-08-14 16:02:04 +02:00
e79a815f73 Merge pull request #432 from lukahartwig/docs-add-docker-events-examples
Added docker events example with until option to documentation
Upstream-commit: b8d325efd5
Component: cli
2017-08-14 10:57:46 +02:00
5f265aadb9 Merge pull request #349 from jphuynh/shellcheck-scripts
Add scripts folder to shellcheck
Upstream-commit: 53d8886f9c
Component: cli
2017-08-14 10:26:45 +02:00
26d7f26c3b Merge pull request #434 from bryfry/patch-1
Documentation: Make the example match the documentation table
Upstream-commit: 7ceb25f895
Component: cli
2017-08-14 10:25:20 +02:00
c5b1acac69 Merge pull request #390 from thaJeztah/add-test-for-github-special-case
Add test for github.com special handling
Upstream-commit: aaf6939679
Component: cli
2017-08-14 10:24:13 +02:00
44e937f3a9 Print timestamp when --human=true
* Setting "--human=true" changes "CreatedSince" format

* "CreatedAt" now displays the creation timestamp as
  specified in the documents

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 5e7f0f67a8
Component: cli
2017-08-12 23:12:47 +03:00
7e214d1c8f Singularize / pluralize "argument(s)" in error message
The validation functions to test for the number of passed arguments did not
pluralize `argument(s)`, and used `argument(s)` in all cases.

This patch adds a simple `pluralize()` helper to improve this.

Before this change, `argument(s)` was used in all cases:

    $ docker container ls foobar
    "docker container ls" accepts no argument(s).

    $ docker network create one two
    "docker network create" requires exactly 1 argument(s).

    $ docker network connect
    "docker network connect" requires exactly 2 argument(s).

    $ docker volume create one two
    "docker volume create" requires at most 1 argument(s).

After this change, `argument(s)` is properly singularized or plurarized:

    $ docker container ls foobar
    "docker container ls" accepts no arguments.

    $ docker network create one two
    "docker network create" requires exactly 1 argument.

    $ docker network connect
    "docker network connect" requires exactly 2 arguments.

    $ docker volume create one two
    "docker volume create" requires at most 1 argument.

Test cases were updated accordingly.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b9a7f35e02
Component: cli
2017-08-12 18:25:38 +02:00
c66aa086ca Make the example match the documentation
the missing `driver` made my bridge not have the correct MTU when i copied from the example and not the doc table.  Brings them into alignment.

Signed-off-by: bryfry <bryon@fryer.io>
Upstream-commit: 6118658f73
Component: cli
2017-08-11 21:47:34 -04:00
a87bcbcfcf Added docker events example with until option to documentation
Signed-off-by: Luka Hartwig <mail@lukahartwig.de>
Upstream-commit: f959ac7fba
Component: cli
2017-08-11 01:29:48 +02:00
148a571829 Add network and target to build in v3.4
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: eef256943b
Component: cli
2017-08-09 10:50:32 -04:00
b8d6be0b5a Merge pull request #428 from albers/completion-stack-deploy
Improve bash completion for `stack deploy`
Upstream-commit: 4b61f560b5
Component: cli
2017-08-08 18:19:06 +02:00
8ce8f74288 Improve bash completion for stack deploy
This adds completion of stack names, which is very useful when updating
existing stacks.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d2d4dbf5af
Component: cli
2017-08-08 17:56:14 +02:00
763e45c80b Merge pull request #427 from vdemeester/import-templates-from-docker-pkg
Import templates from docker pkg
Upstream-commit: f3c325f390
Component: cli
2017-08-08 11:55:58 -04:00
e6ade3ec40 Re-run vndr on docker/docker to remove pkg/templates
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 680c827075
Component: cli
2017-08-08 17:26:30 +02:00
d19b8b0269 Import docker/docker/pkg/templates to cli
This package will be deprecated/removed from `docker/docker/pkg` and
is mainly used for the cli format options. Let's import it and
maintain here.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a6800f95fa
Component: cli
2017-08-08 17:26:24 +02:00
bee0cb9a32 Merge pull request #413 from albers/completion-build--target
Add bash completion for `docker build --target`
Upstream-commit: 227e042ff0
Component: cli
2017-08-07 12:41:03 -07:00
fd8ca099c7 Merge pull request #419 from thaJeztah/easier-testing-in-container
Add "build" dir to PATH in dev-container
Upstream-commit: e0f1e4d5d7
Component: cli
2017-08-07 16:25:19 +02:00
d65ac7e37d Merge pull request #378 from riyazdf/contributing-doc
Add Contribution guidelines doc
Upstream-commit: 056739abfe
Component: cli
2017-08-07 13:27:31 +02:00
aac72d07e3 Merge pull request #423 from albers/docs-fix-invalid-plugins
Fix invalid plugin references in docs
Upstream-commit: eb4672c149
Component: cli
2017-08-07 12:53:44 +02:00
48c6aae018 Fix invalid plugin references in docs
The plugins `tiborvass/sample-volume-plugins` and `tiborvass/no-remove`
do not exist.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2dca576a4c
Component: cli
2017-08-07 11:15:39 +02:00
0d587285b1 Add "build" dir to PATH in dev-container
This makes running the client easier inside
the container; allowing to use just `docker`
instead of `build/docker`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7a0b49df23
Component: cli
2017-08-05 03:24:21 +02:00
6611cd0751 Merge pull request #415 from jlhawn/client_dial_enable_tcp_keepalive
Enable TCP Keep-Alive in Docker client
Upstream-commit: f7b78dc137
Component: cli
2017-08-03 19:42:57 +02:00
bf8164c7d6 Add test for github.com special handling
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f007d623a8
Component: cli
2017-08-03 17:53:42 +02:00