e585bc4a87
Hide help flag from help output.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f50345a26c
2017-10-26 12:17:50 -04:00
6c4fe5e7de
Merge pull request #642 from dnephin/use-upstream-spf13-cobra
...
Use upstream spf13 cobra
Upstream-commit: e59f3e2925
2017-10-26 10:05:11 +02:00
2613cd4235
Merge pull request #644 from thaJeztah/fix-daemon-config-example
...
Fix daemon.json runtime example
Upstream-commit: 41797e1753
2017-10-26 09:31:57 +02:00
c8091c3807
Merge pull request #641 from cpuguy83/35295_memusage_pagecache_note
...
Add note about reported memory stats on linux
Upstream-commit: ecf06bba21
2017-10-26 02:28:06 +02:00
5c9abffbcf
Fix daemon.json runtime example
...
The example in the documentation used "runc", which is a
reserved runtime name (as it's the default).
This patch updates the example, and uses a different name.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1e5d013064
2017-10-26 02:15:49 +02:00
7c4d9074f1
Fix UseLine
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8e600e10f7
2017-10-25 18:22:04 -04:00
a3b0929c08
Add note about reported memory stats on linux
...
Since the API and the CLI both have a "Usage" field for memory, clarify
that the CLI does additional calculations to avoid confusion of API
consumers.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: a6acacc533
2017-10-25 16:50:43 -04:00
2e5b6e24c7
Update code for upstream cobra
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4205416c9b
2017-10-25 14:49:26 -04:00
bf87c9c8da
Update vendor of spf13/pflag and spf13/cobra
...
Use upstream isntead of fork for cobra.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0f2ebae056
2017-10-25 12:50:37 -04:00
4883b5d512
Merge pull request #638 from BastianHofmann/patch-1
...
Fix json formating in dockerd docs
Upstream-commit: 9b7656cc05
2017-10-25 10:56:21 +02:00
25caba7d97
Fix json formatting in dockerd docs
...
Fix another json formatiing error.
Signed-off-by: Bastian Hofmann <bastianhofmann@me.com >
Upstream-commit: c7867f5cc6
2017-10-25 08:50:34 +02:00
5ab47d5b72
Merge pull request #639 from thaJeztah/add-squash-known-issue
...
Mention known limitations for --squash
Upstream-commit: 465a83a140
2017-10-24 12:04:59 -04:00
835cb984a3
Mention known limitations for --squash
...
The experimental `docker build --squash` feature has a number
of limitations. For most use-cases, multi-stage builds are
a better alternative.
This patch lists the known limitations, and adds a link to
multi-stage builds.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bcc228ac6b
2017-10-24 14:32:06 +02:00
869831ccd7
Merge pull request #632 from mstanleyjones/fix-system-prune-f-flag
...
For system prune, -f is not an alias for --filter
Upstream-commit: 3352c0e137
2017-10-20 16:17:19 -04:00
7b8e36ff5a
For system prune, -f is not an alias for --filter
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: d4e5481cd4
2017-10-20 10:51:28 -07:00
4fab58b1ff
Merge pull request #624 from mstanleyjones/guidance-on-labels
...
Update info on labels
Upstream-commit: 3785a314e1
2017-10-20 16:33:13 +02:00
2ac0f85aa9
Update info on labels
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: e49e1ea739
2017-10-16 10:10:49 -07:00
b5021afc0e
Merge pull request #620 from dnephin/add-nakedret-linter
...
Add nakedret linter
Upstream-commit: 1401d5daf2
2017-10-13 14:54:00 +02:00
9528dbc7cf
Merge pull request #616 from thaJeztah/bump-moby
...
Bump moby to 1ffa10ee2630917e4f2a88f5e4daf34d700eaa1f
Upstream-commit: 54a10d544c
2017-10-13 11:48:41 +02:00
0f96be35a7
Add nakedret linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: dbd96badb6
2017-10-12 11:48:51 -04:00
f0af38693c
Updates for updated moby version
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e56a58e4ed
2017-10-12 01:02:10 +02:00
3854f6d75a
Bump moby to 1ffa10ee2630917e4f2a88f5e4daf34d700eaa1f
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2f393694c2
2017-10-12 01:01:48 +02:00
107b0ea669
Merge pull request #611 from albers/completion-stack-deploy--resolve-image
...
Add bash completion for `stack deploy --resolve-image`
Upstream-commit: 6ef0ea82ea
2017-10-11 22:28:51 +02:00
81908c29d1
Merge pull request #580 from djgoosen/patch-1
...
Update rmi.md
Upstream-commit: 0a6e1cb3aa
2017-10-11 22:17:46 +02:00
fff68fafe8
Merge pull request #618 from albers/completion-secret-create--driver
...
Add bash completion for `secret create --driver`
Upstream-commit: 5c9784e3a3
2017-10-11 13:10:00 -04:00
0750d56f05
Add bash completion for secret create --driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1d7a31f87e
2017-10-11 18:55:28 +02:00
ce49598ea9
Merge pull request #607 from riyazdf/update-dct-push-and-pull
...
Mutate image references where needed for trusted pulls
Upstream-commit: b70f9296dd
2017-10-11 15:08:04 +02:00
66b3ea1c4e
Update e2e test for image pull to check stdout
...
Also add TEST_DEBUG env variable for debugging E2E tests.
And change icmd environment helpers to fit the CmdOp interface os they
can be passed to 'icmd.RunCmd()'
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b11c11ea74
2017-10-10 17:04:49 -04:00
ac808691c3
Refactor runPull to remove second GetImageReferencesAndAuth
...
Fix unit tests to catch the regression.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e548861481
2017-10-10 16:32:27 -04:00
ac06921a97
factor out rigging for pushing unsigned busybox image
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 7dda6fc3c9
2017-10-10 12:00:52 -07:00
697f2a54c7
update image pull tests
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 46f3d8bb7f
2017-10-10 11:20:54 -07:00
8990f67e9c
get e2e working with notary service
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ade675d36c
2017-10-10 11:19:02 -07:00
d57a85ccfd
update e2e tests for content trust tests
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 6e3bafd06b
2017-10-10 11:19:02 -07:00
f57d5e7b36
trust: update references when pulling
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 067fff8b03
2017-10-10 11:19:02 -07:00
c5166635d0
Update rmi.md
...
Signed-off-by: Daniel Goosen <daniel.goosen@surveysampling.com >
Upstream-commit: 9004495541
2017-10-10 10:27:54 -07:00
a808a78d53
Add bash completion for stack deploy --resolve-image
...
Also adds minimal documentation for this flag.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9559b9b7a8
2017-10-09 13:39:54 +02:00
e42b52cb32
Merge pull request #492 from albers/completion-daemon--network-control-plane-mtu
...
Add bash completion for `dockerd --network-control-plane-mtu`
Upstream-commit: fb7a817583
2017-10-08 17:49:58 +02:00
6fe1666e36
Merge pull request #610 from albers/completion-service--detach
...
Update bash completion and deprecation for synchronous service updates
Upstream-commit: e3c580c300
2017-10-07 15:31:48 +02:00
c50c8a6cf3
Update deprecation for synchronous service updates
...
- The default was not changed in 17.09 but will be in 17.10
- `service scale` and `service rollback` are also affected.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 20d9ceca78
2017-10-07 14:28:56 +02:00
80eb2d603b
Update bash completion for synchronous docker service commands
...
The default value for
`docker service create|update|scale|rollback --detach|-d` changed from
`true` to `false`.
This updates bash completion to complete just `--detach|-d`.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 60bfaba6fb
2017-10-07 13:57:26 +02:00
9d743bcb10
Merge pull request #598 from thaJeztah/fix-dockerd-heading-levels
...
Fix dockerd reference heading levels
Upstream-commit: 1649af8129
2017-10-06 01:51:19 +02:00
6a849f46fd
Merge pull request #603 from thaJeztah/fix-service-create-markdown
...
Fix markdown link in service-create reference docs
Upstream-commit: 0f659d99bd
2017-10-05 21:49:29 +02:00
e55a2343f6
Merge pull request #547 from rdxmb/small-change
...
small reference change
Upstream-commit: 2801d382c6
2017-10-05 11:56:33 -07:00
50093b06f0
Merge pull request #600 from thaJeztah/bump-golang-to-1.8.4
...
Bump Go to 1.8.4
Upstream-commit: 08d81681af
2017-10-05 18:49:00 +02:00
35d18f8b33
Bump Go to 1.8.4
...
Bumps the Go version used to 1.8.4, which contains security fixes;
https://groups.google.com/forum/#!topic/golang-announce/1hZYiemnkdE
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6b35e98a61
2017-10-05 18:43:33 +02:00
afca8202d7
Fix markdown link in service-create reference docs
...
Markdown nested in a HTML table doesn't work, so changing
the link to a plain HTML link.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6b6511f191
2017-10-05 12:17:40 +02:00
d9d9c820a9
Merge pull request #599 from friederbluemle/fix-github-spelling
...
Fix GitHub spelling
Upstream-commit: 472fcca185
2017-10-05 09:39:39 +02:00
ab0a17f568
Fix GitHub spelling
...
Signed-off-by: Frieder Bluemle <frieder.bluemle@gmail.com >
Upstream-commit: 45c9b9b6c1
2017-10-05 01:14:31 +08:00
962e70214f
Fix dockerd reference heading levels
...
Commit ddadd3db49github@gone.nl >
Upstream-commit: aca0421eb8
2017-10-04 18:09:12 +02:00
669254d0fe
Merge pull request #568 from matt9ucci/DockerCompletion
...
Add link to DockerCompletion for PowerShell
Upstream-commit: f7ef79228e
2017-10-03 21:50:58 +02:00
