Commit Graph
37584 Commits
Author SHA1 Message Date
Sven Dowideit e5bc16370d add links to the Dockerfiles as canonical external requirements, add example of building and exposing the docs and simplify the Dockerfile for cacheability
Upstream-commit: 23e91a6d7f
Component: cli
2017-06-02 00:06:19 +00:00
Andy Rothfusz 199feb6224 Clean up level 3 headers.
Upstream-commit: bed37d2204
Component: cli
2017-06-02 00:06:19 +00:00
Tianon Gravi 78b8a0f99b Add zsh completion from @felixr with permission
See https://github.com/felixr/docker-zsh-completion for the original.
See also https://github.com/dotcloud/docker/issues/2202#issuecomment-26313287

Fixes #2202
Upstream-commit: 9914c18a11
Component: cli
2017-06-02 00:06:19 +00:00
Tianon Gravi af8f58b268 Move contrib/docker.bash to contrib/completion/bash/docker for better organization
Upstream-commit: 24c9b31edf
Component: cli
2017-06-02 00:06:19 +00:00
Andy Rothfusz 9463d1159a Fix #1919 document how to edit and release docs.
Upstream-commit: ce220ef43b
Component: cli
2017-06-02 00:06:19 +00:00
Pascal Borreli 43d8f667fd Fixed typos
Upstream-commit: 147b04ce2b
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher Peskens d7f43325f2 Fixed some typo's and formatting issues in remote api documentation.
Upstream-commit: 22ab3ddc8a
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher 67f5bb8bb9 Some more improvements on the docs readme. Removed references to website.
Upstream-commit: 2216afb617
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher Peskens 34f087441b Updated docs README with instructions to preview the generated manfile, and where to get the one generated by sphinx.
Upstream-commit: 9c5f4391e1
Component: cli
2017-06-02 00:06:19 +00:00
Thatcher Peskens cdc3377009 Enabled the docs to generate manpages.
* changed conf.py to reference toctree.rst instead of index
* Added note to README to upgrade your sphinx to the latest version to prevent a bug with .. note:: blocks.
Upstream-commit: 77926c6033
Component: cli
2017-06-02 00:06:19 +00:00
Daniel Gasienica 99a1852177 Make style consistent
Upstream-commit: 74428120af
Component: cli
2017-06-02 00:06:19 +00:00
Daniel Gasienica 95534b5821 Add Mac OS X instructions for doc tools
Upstream-commit: 3c035fa508
Component: cli
2017-06-02 00:06:19 +00:00
Daniel Gasienica d08724ab40 Add make server command to preview docs
Upstream-commit: 99dfa4e7e8
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens aec84e0e64 Updated index to reflect new (short) 'engine' message (merged with solomon's new text), also moved around the layout a bit and fixed some small text errors.
Upstream-commit: 6d79cab514
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens c6d0d33e87 Added code and color for 'note' and updated the hello world note.
Upstream-commit: f4399fe403
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens 9d6a9f36e8 Improved README
Upstream-commit: 8a39a45f05
Component: cli
2017-06-02 00:06:18 +00:00
Thatcher Peskens b07dff2c8e Merge of docker-website into the docker documentation.
Upstream-commit: 244477e27f
Component: cli
2017-06-02 00:06:18 +00:00
dhrp 73808e2330 create README.md at this place for preview.
Upstream-commit: f35a9d8098
Component: cli
2017-06-02 00:06:18 +00:00
Victor Vieux a1a5b0a48d move multireader out of /pkg
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 2445e6b99d4beecb25d556d9a099bdf47703e174
Component: engine
2017-06-01 16:22:00 -07:00
Vincent Demeester d6016b7163 Merge pull request #33474 from mlaventure/test-with-actual-cli-version
Use actual cli version for TestConfigHTTPHeader
Upstream-commit: 986510951ae3c1accb7c6be2993f54300edcad77
Component: engine
2017-06-01 16:18:04 -07:00
Andrew Hsu ae6e09bc74 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-06-01 23:09:14 +00:00
Sebastiaan van Stijn 10e27f6561 Merge pull request #33335 from cpuguy83/33334_check_unset_sig
Check signal is unset before using user stopsignal
Upstream-commit: 872e28bb1452c6e333549a55dcb651fcff2a6bd1
Component: engine
2017-06-01 23:10:16 +02:00
Andrew Hsu 089484b881 Merge component 'cli' from git@github.com:docker/cli master 2017-06-01 21:02:34 +00:00
Andrew Hsu aa101def38 Merge component 'engine' from git@github.com:moby/moby master 2017-06-01 20:46:42 +00:00
Vincent Demeester 1fd0a9619a Remove cli/flags package
- Moving the `common*.go` files in `cmd/dockerd` directly (it's the
  only place it's getting used)
- Rename `cli/flags` to `cli/config` because it's the only thing left
  in that package 👼

Now, `integration-cli` does *truly* not depend on `cobra` stuff.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9ff9a91ab7f964f4e5042f94fe22dd50b5c3d832
Component: engine
2017-06-01 13:34:31 -07:00
Daniel Nephin cd8431c122 Use a map instad of a switch/case for Compose transform.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 97ebc19438
Component: cli
2017-06-01 15:22:09 -04:00
Daniel Nephin 25b6069bb2 Compose: Improve error messages when resource creation/updates fail.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 729d07a371
Component: cli
2017-06-01 15:03:04 -04:00
Daniel Nephin 5f4e132587 Merge pull request #144 from thaJeztah/allow-some-flags-during-rollback
Allow --detach and --quiet flags when using --rollback
Upstream-commit: 30af87981d
Component: cli
2017-06-01 14:47:08 -04:00
Sebastiaan van Stijn d4709bb827 Merge pull request #33446 from raja-sami-10p/pkg/platform
Increase the Coverage of pkg/platform
Upstream-commit: 7ff205571f6016c10638e16026d1673b2f5b6615
Component: engine
2017-06-01 19:14:15 +02:00
Tonis Tiigi eb999c14d0 Add builder dev report for 2017-05-29
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1e1ec2fbca9aa67882ebc722dbdbc50c54255660
Component: engine
2017-06-01 09:46:20 -07:00
Kenfe-Mickael Laventure be69462c28 Use actual cli version for TestConfigHTTPHeader
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 0b90edc22fa95e04b4d3208a72bb276be699b260
Component: engine
2017-06-01 09:35:30 -07:00
Daniel Nephin 67be6e9ac8 Fix complexity of service/ps.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b5baffde44
Component: cli
2017-06-01 11:49:16 -04:00
Pavel Tikhomirov 008c8eb206 Do not treat C.sysconf(C._SC_NPROCESSORS_ONLN) non-zero errno as error
Treat return code -1 as error instead.

People from glibc say that errno is undefined in case of successful
sysconf call according to POSIX standard:
Glibc bug: https://sourceware.org/bugzilla/show_bug.cgi?id=21536

More over in sysconf man it is wrongly said that "errno is not changed"
on success. So I've created a bug to man-pages:
https://bugzilla.kernel.org/show_bug.cgi?id=195955

Background: Glibc's sysconf(_SC_NPROCESSORS_ONLN) changes errno to
ENOENT, if there is no /sys/devices/system/cpu/online file, while
the call itself is successful. In Virtuozzo containers we prohibit
most of sysfs files for security reasons. So we have Run():daemon
/stats/collector.go infinitely loop never actualy collecting stats
from publisher pairs.

v2: add comment

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Upstream-commit: dec084962eab41eb20b1808955de34cfec4fc8b3
Component: engine
2017-06-01 18:23:49 +03:00
Brian Goff 830b3113ae Merge pull request #136 from johnstep/fix_stack_service_volumes
Fix stack compose bind-mount volumes for Windows
Upstream-commit: bf22fc6781
Component: cli
2017-06-01 11:06:06 -04:00
Sebastiaan van Stijn 9d937bfa88 Update deprecated.md for removal of --email flag
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 43239f62bedc4721d27744d21c122622988bb3ae
Component: engine
2017-06-01 17:05:42 +02:00
Sebastiaan van Stijn e1f6bc3e4f Allow --detach and --quiet flags when using --rollback
Commit 78c204ef79 added
(f9bd8ec8b268581f93095c5a80679f0a8ff498bf in the moby repo)
a validation to prevent `--rollback` from being used
in combination with other flags that update the
service spec.

This validation was not taking into account that
some flags only affect the CLI behavior, and
are okay to be used when rolling back.

This patch updates the validation, and adds
`--quiet` and `--detach` to the list of allowed
flags.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f10f29df8d
Component: cli
2017-06-01 16:31:07 +02:00
Evan Hazlett 5f38794750 Merge pull request #32590 from moypray/containerd
Fix when containerd restarted, event handler may exit
Upstream-commit: d7c125791a3fa6cf233a8f9d017c28ae65d5b535
Component: engine
2017-06-01 08:16:24 -04:00
Sebastiaan van Stijn d0a95fbfec Remove deprecated -e/--email flag from docker login
The `docker login -e` / `docker login --email` option was deprecated in
Docker 1.11 (https://github.com/moby/moby/releases/tag/v1.11.0) through
aee260d4eb3aa0fc86ee5038010b7bbc24512ae5 (April 2016), and when used has
been outputing a deprecation warning since;

    Flag --email has been deprecated, will be removed in 17.06.

Originally this option was scheduled to be removed in docker 1.13, but
extended to docker 17.06 due to a change in our deprecation policy.

Given that only docker 1.10 and older use this flag (which is EOL, including
for CS versions, as of February 2017), will now be removed.

With this patch, `docker login` will now produce an Error if the flag
is used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8b383d2351
Component: cli
2017-06-01 12:55:04 +02:00
Wentao Zhang 52c11cb152 Fix delete a image while saving it, delete successfully but failed to save it
Issue Description:
 * 1. Saving more than one images, `docker save -o a.tar aaa bbb`
 * 2. Delete the last image which in saving progress.  `docker rmi bbb`

Espected:
 Saving images operation shouldn't be disturbed. But the real result is that failed to
save image and get an error as below:
  `Error response from daemon: open
/var/lib/docker/image/devicemapper/imagedb/content/sha256/7c24e4d533a76e801662ad1b7e6e06bc1204f80110b5623e96ba2877c51479a1:
no such file or directory`

Analysis:
  1. While saving more than one images, it will get all the image info from reference/imagestore,
     and then using the `cached data` to save the images to a tar file.
  2. But this process doesn't have a resource lock, if a deletion operation comes, the image will be deleted,
     so saving operation will fail.

Solution:
 When begin to save an image, `Get` all the layers first. then the
deletion operation won't delete the layers.

Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com>
Upstream-commit: 4a014e6b0d7e2d310ee1ba442128a6802559a63a
Component: engine
2017-06-01 18:13:20 +08:00
Naveed Jamil e17da42389 Add test coverage to pkg/signal
Signed-off-by: Naveed Jamil <naveed.jamil@tenpearls.com>
Upstream-commit: 4b0df45c1a261354f10abb151b9acfa6b61f517d
Component: engine
2017-06-01 14:53:15 +05:00
Doug Davis b289cb3026 Merge pull request #33465 from ChenMin46/fix_typos
Fix Typos: continer,contianer -> container
Upstream-commit: 9fbcec6219aad74201da428b0b12141b5c812609
Component: engine
2017-06-01 13:52:18 +09:00
Chen Min 02f992f2b8 Fix Typos: continer,contianer -> container
Signed-off-by: Chen Min <chenmin46@huawei.com>
Upstream-commit: 2b62eb434be4770c101ef79666a952fd7f43a742
Component: engine
2017-06-01 19:21:01 +08:00
John Stephens 144f2f5310 Fix stack compose bind-mount volumes for Windows
For stack compose files, use filepath.IsAbs instead of path.IsAbs, for
bind-mounted service volumes, because filepath.IsAbs handles Windows
paths, while path.IsAbs does not.

Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 9043d39dea
Component: cli
2017-05-31 21:13:58 -07:00
John Howard 4cb2e1a089 Builder: Fix parser directive refactoring
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c97170d618b7a1f35f47672143bd287666802287
Component: engine
2017-05-31 18:48:27 -07:00
Ying Li dbc4b6c5bd Do not log the CA config CA signing key in debug mode.
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: d60f18204978d438d1eb336512576d47991c8ac1
Component: engine
2017-05-31 18:15:33 -07:00
Madhu Venugopal e930dafbb3 Vendoring libnetwork 2e99f06621c23a5f4038968f1af1e28c84e4104e
Fixes #33415
Fixes #33346
Implemented few additional IPVS APIs to be used by other projects

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0484bdb6ca0ddd0bebc490e335a7f788cdc30f13
Component: engine
2017-05-31 16:04:00 -07:00
Vincent Demeester 472b98cb50 Merge pull request #132 from mavenugo/stack-host
Host and Bridge network support in docker stack deploy
Upstream-commit: efaadcf465
Component: cli
2017-05-31 15:07:56 -07:00
Andrew Hsu 6ff2c18564 Merge pull request #6 from vieux/update_VERSION
update VERSION file
2017-05-31 15:03:04 -07:00
Sebastiaan van Stijn beeb275932 Fix prefix-matching for service ps
The docker CLI matches objects either by ID _prefix_
or a full name match, but not partial name matches.

The correct order of resolution is;

- Full ID match (a name should not be able to mask an ID)
- Full name
- ID-prefix

This patch changes the way services are matched.

Also change to use the first matching service, if there's a
full match (by ID or Name) instead of continue looking for
other possible matches.

Error handling changed;

- Do not error early if multiple services were requested
  and one or more services were not found. Print the
  services that were not found after printing those that
  _were_ found instead
- Print an error if ID-prefix matching is ambiguous

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6279612443
Component: cli
2017-05-31 21:43:56 +02:00
Brian Goff 103f3041e5 Lock container while connecting to a new network.
`ConnectToNetwork` is modfying the container but is not locking the
object.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4d0888e32bccfd8c0f27a7b66b2a5607d42e2698
Component: engine
2017-05-31 15:13:04 -04:00