Commit Graph

4424 Commits

Author SHA1 Message Date
Joffrey F 1667073908 Update schemas to prevent invalid properties in deploy.resources
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-17 15:58:51 -07:00
Tibor Vass e57842edb8 Merge pull request #449 from dnephin/use-gotestyourself
Remove dependency on (most of) docker/docker/pkg/testutil
2017-08-17 12:37:18 -07:00
Vincent Demeester 070d0811e3 Merge pull request #448 from thaJeztah/fix-typo
Fix typo and minor Markdown edits
2017-08-17 19:59:55 +02:00
Sebastiaan van Stijn 9544b70cb3
Fix typo and minor Markdown edits
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-17 02:29:24 +02:00
Sebastiaan van Stijn 799de1dae2 Merge pull request #447 from thaJeztah/fix-liquid-warning
Fix "liquid" warning on logging plugins page
2017-08-17 02:27:34 +02:00
Sebastiaan van Stijn d30987f85f
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>
2017-08-17 00:56:54 +02:00
Sebastiaan van Stijn 3e831e4472 Merge pull request #446 from krizalys/fix-grammar
Fixed grammar
2017-08-16 23:20:31 +02:00
Daniel Nephin 15837afa77 Replace pkg/testutil/tempfile with gotestyourself/fs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
Daniel Nephin 505a0fe45f Update volume command tests to use the new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
Daniel Nephin 3d68aa8416 Update swarm command tests to use the new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
Daniel Nephin 1dd742eac8 Update stack and task command tests to new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
Daniel Nephin 4c62d7288f Update service and secret command tests to new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
Daniel Nephin 0e2bf7420a 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>
2017-08-16 14:23:15 -04:00
Daniel Nephin 75f7bfedf8 Update image command tests to use the new golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:20:36 -04:00
Daniel Nephin f9007ad7db Update config and checkpoint commands to use gotestyourself/golden
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:19:00 -04:00
Daniel Nephin 882992c6fc Add gotestyourself dependency.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:08:08 -04:00
Christophe Vidal 9c4b9c6f63 Updated & reformulated kinds of mounts section
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
2017-08-17 00:51:35 +07:00
Sebastiaan van Stijn 17adcbdada Merge pull request #444 from dnephin/faster-validate-ci
Don't sleep in CI
2017-08-16 13:45:44 +02:00
Tibor Vass 35c60bbd9b Merge pull request #443 from dnephin/ignore-codecov-upload-fail
Ignore codecov upload failures in CI
2017-08-15 13:05:43 -07:00
Daniel Nephin 058733969c 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>
2017-08-15 14:34:43 -04:00
Daniel Nephin 4e09dba068 Ignore codecov upload failures in CI.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-15 14:34:43 -04:00
Sebastiaan van Stijn 04659b8802 Merge pull request #430 from dnephin/add-build-target-to-compose
Add network and target to build in v3.4
2017-08-15 19:20:49 +02:00
Daniel Nephin 6a7dc459dd Ignore codecov upload failures in CI.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-15 13:17:20 -04:00
Daniel Nephin 703a7cca2b Merge pull request #354 from dnephin/warn-outside-container
Add a warning when make is run outside of a container
2017-08-14 14:10:12 -04:00
Daniel Nephin 3b8cf20a0c Merge pull request #436 from thaJeztah/improve-singular-plural-message
Singularize / pluralize "argument(s)" in error message
2017-08-14 11:06:25 -04:00
Sebastiaan van Stijn 898f1e2997 Merge pull request #438 from ripcurld0/history_fix
Print timestamp when --human=true
2017-08-14 16:02:04 +02:00
Vincent Demeester b8d325efd5 Merge pull request #432 from lukahartwig/docs-add-docker-events-examples
Added docker events example with until option to documentation
2017-08-14 10:57:46 +02:00
Vincent Demeester 53d8886f9c Merge pull request #349 from jphuynh/shellcheck-scripts
Add scripts folder to shellcheck
2017-08-14 10:26:45 +02:00
Vincent Demeester 7ceb25f895 Merge pull request #434 from bryfry/patch-1
Documentation: Make the example match the documentation table
2017-08-14 10:25:20 +02:00
Vincent Demeester aaf6939679 Merge pull request #390 from thaJeztah/add-test-for-github-special-case
Add test for github.com special handling
2017-08-14 10:24:13 +02:00
Boaz Shuster 5e7f0f67a8 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>
2017-08-12 23:12:47 +03:00
Sebastiaan van Stijn b9a7f35e02
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>
2017-08-12 18:25:38 +02:00
bryfry 6118658f73 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>
2017-08-11 21:47:34 -04:00
Luka Hartwig f959ac7fba Added docker events example with until option to documentation
Signed-off-by: Luka Hartwig <mail@lukahartwig.de>
2017-08-11 01:29:48 +02:00
Daniel Nephin eef256943b Add network and target to build in v3.4
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-09 10:50:32 -04:00
Kenfe-Mickaël Laventure 4b61f560b5 Merge pull request #428 from albers/completion-stack-deploy
Improve bash completion for `stack deploy`
2017-08-08 18:19:06 +02:00
Harald Albers d2d4dbf5af 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>
2017-08-08 17:56:14 +02:00
Daniel Nephin f3c325f390 Merge pull request #427 from vdemeester/import-templates-from-docker-pkg
Import templates from docker pkg
2017-08-08 11:55:58 -04:00
Vincent Demeester 680c827075
Re-run vndr on docker/docker to remove pkg/templates
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-08-08 17:26:30 +02:00
Vincent Demeester a6800f95fa
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>
2017-08-08 17:26:24 +02:00
Tõnis Tiigi 227e042ff0 Merge pull request #413 from albers/completion-build--target
Add bash completion for `docker build --target`
2017-08-07 12:41:03 -07:00
Kenfe-Mickaël Laventure e0f1e4d5d7 Merge pull request #419 from thaJeztah/easier-testing-in-container
Add "build" dir to PATH in dev-container
2017-08-07 16:25:19 +02:00
Sebastiaan van Stijn 056739abfe Merge pull request #378 from riyazdf/contributing-doc
Add Contribution guidelines doc
2017-08-07 13:27:31 +02:00
Sebastiaan van Stijn eb4672c149 Merge pull request #423 from albers/docs-fix-invalid-plugins
Fix invalid plugin references in docs
2017-08-07 12:53:44 +02:00
Harald Albers 2dca576a4c 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>
2017-08-07 11:15:39 +02:00
Sebastiaan van Stijn 7a0b49df23
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>
2017-08-05 03:24:21 +02:00
Sebastiaan van Stijn f7b78dc137 Merge pull request #415 from jlhawn/client_dial_enable_tcp_keepalive
Enable TCP Keep-Alive in Docker client
2017-08-03 19:42:57 +02:00
Sebastiaan van Stijn f007d623a8
Add test for github.com special handling
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-03 17:53:42 +02:00
Sebastiaan van Stijn 7e2b0708a4 Merge pull request #411 from mstanleyjones/add-infinit
Add Infinit plugin
2017-08-03 17:34:07 +02:00
Josh Hawn 2831a04cba Enable TCP Keep-Alive in Docker client
Some network environments may have NATs, proxies, or gateways which
kill idle connections. There are many Docker API operations which may
be idle for long periods of time (such as ContainerWait and ContainerAttach)
and may result in unexpected connection closures or hangs if TCP keepalives
are not used.

This patch updates the default HTTP transport used by the Docker client
package to enable TCP Keep-Alive with a keep-alive interval of 30 seconds.
It also sets a connect timeout of 30 seconds.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2017-08-02 14:35:03 -07:00