Commit Graph
37584 Commits
Author SHA1 Message Date
allencloud f4101eb2fb return prune data when context canceled
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 87b4dc2002d50e245f432bbd97e9dee2db25cf96
Component: engine
2017-07-10 10:06:24 +08:00
Sebastiaan van Stijn 87ec40c8a8 Merge pull request #33999 from Microsoft/jjh/opengcs0.0.9
Revendor jhowardmsft/opengcs v0.0.9
Upstream-commit: 20eb2caa3bad9a0937d80a56bd4a3060d9f8c573
Component: engine
2017-07-09 17:46:43 -07:00
Sebastiaan van Stijn 5c3ab94b35 Merge pull request #33988 from Deborah-Digges/patch-1
Add link to docker.com in README.md
Upstream-commit: 15a22a6641f4e418d37fe5c75380dc57c56db3f1
Component: engine
2017-07-09 16:40:38 -07:00
Sebastiaan van Stijn 3578bb4ff2 Merge pull request #259 from aaronlehmann/service-progress-surface-error
progress: Show task error in place of progress bar
Upstream-commit: 7ae9bc141c
Component: cli
2017-07-09 00:04:38 -07:00
Sebastiaan van Stijn b41167fb89 Merge pull request #270 from tych0/warn-only-about-password-on-cli
login: print a big warning when using --password
Upstream-commit: c99530b1d2
Component: cli
2017-07-08 16:37:40 -07:00
Sebastiaan van Stijn dddc944164 Merge pull request #33990 from thaJeztah/remove-install-script
Remove old "get.docker.com" install script
Upstream-commit: b227c568dd749512ff43e1d7aecf7580f305cba7
Component: engine
2017-07-07 21:50:37 -07:00
Aaron Lehmann dd3dcdbd0d vendor: add go-semver
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 733f672100a436b272ea871c4ba427f07d7bfa8a
Component: engine
2017-07-07 16:42:14 -07:00
Sebastiaan van Stijn 4cb9d45e3f Merge pull request #33541 from aaronlehmann/lock-unlock-tests-poll
integration-cli: Replace sleeps with polling in swarm lock/unlock tests
Upstream-commit: ced0b6cb5bd3acd223dc20a13ba5be1dbf0ff643
Component: engine
2017-07-07 16:41:01 -07:00
Yassine TIJANI 23b4fdf3bc removing TODO, and explain why we can't filter by id on the matchevent method.
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
Upstream-commit: be9aa09246534a1fdf7c08cf287dbe1e6de375c9
Component: engine
2017-07-07 23:32:37 +02:00
Aaron Lehmann 89b86f4aaf Merge pull request #308 from ProgVal/patch-1
Fix typo (proceed -> precede)
Upstream-commit: 534c3d285b
Component: cli
2017-07-07 13:45:00 -07:00
Valentin Lorentz aa221f747d Fix typo (proceed -> precede)
Signed-off-by: Valentin Lorentz <progval+git@progval.net>
Upstream-commit: 4f3a8aecad
Component: cli
2017-07-07 13:17:15 +02:00
Yong Tang 0887a18a3a Merge pull request #33575 from cpuguy83/plugins_on_swarm
Plugins on swarm
Upstream-commit: 05c7c311390911daebcf5d9519dee813fc02a887
Component: engine
2017-07-07 02:23:07 -07:00
Yong Tang 0371882bb8 Merge pull request #33662 from madhanrm/sharedendpoint
Include Endpoint List for Shared Endpoints
Upstream-commit: 9aecbbf9bf50dd5c3d250e8dc1c74360a9f30d8e
Component: engine
2017-07-06 23:44:23 -07:00
Akihiro Suda cb27d2c59c Merge pull request #33940 from yaocaigen/fix_container_multi_names
Fix run `docker rename <container-id> new_name` concurrently, the container will have multi names
Upstream-commit: 8e3555f8539d91f530f895e19a51db14f1ca93fb
Component: engine
2017-07-07 10:58:01 +09:00
Aaron Lehmann abfe031053 Merge pull request #33713 from x1022as/error_fd
fd leak and error handling
Upstream-commit: 3be2273d03e4b06dff4006b1a600c578c7aa09fc
Component: engine
2017-07-06 16:47:34 -07:00
Aaron Lehmann 4b7c8d1706 Merge pull request #303 from yastij/fix-SIGSEGV-runContainer
fixing SIGSEGV when running containers
Upstream-commit: dfdbdab651
Component: cli
2017-07-06 15:45:38 -07:00
John Howard eb145cf9d7 Revendor jhowardmsft/opengcs v0.0.9
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7643e8909675fb7b1d52a8c7566fb674db340a39
Component: engine
2017-07-06 14:29:43 -07:00
Tibor Vass 9b7ee7b6ee Merge pull request #33935 from AkihiroSuda/pkg-archive-go1.9
pkg/archive.FileInfoHeader: fill file type bits
Upstream-commit: 0fcd082d886323b4506b28394ee28eaa5a5dfe7f
Component: engine
2017-07-06 14:22:45 -07:00
Sebastiaan van Stijn f6e262f402 Un-fork coreos/etcd - bump to v3.2.1
Commit 077f08bf54dc89d382cbcbd797b2bd7c4867151d
temporarily switch etcd to a fork, pending a
pull-request to be merged, and a new release
that contains the change.

The pull request was merged, and included in
etcd v3.2.0

This patch bumps etcd to v3.2.1, which contains
some bug-fixes on top of v3.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cbc480a40cb22653ac647a8d24957a0c33e3bffe
Component: engine
2017-07-06 13:58:13 -07:00
Madhan Raj Mookkandy 455cc50b83 Include Endpoint List for Shared Endpoints
Do not allow sharing of container network with hyperv containers

Signed-off-by: Madhan Raj Mookkandy <madhanm@microsoft.com>
Upstream-commit: 349913ce9fde34d8acd08fad5ce866401f4d135e
Component: engine
2017-07-06 12:19:17 -07:00
Sebastiaan van Stijn 754d5e0397 Remove old "get.docker.com" install script
This script is part of the Docker product,
and no longer maintained in this repository.

The script has been updated to install Docker CE
packages from https://download.docker.com, and is
now located in the https://github.com/docker/docker-install
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e038f9f81f871237e9ec7a2188eb6b401bdd8809
Component: engine
2017-07-06 11:29:07 -07:00
Brian Goff c782cb6c44 Make plugin emit strongly typed, consumable events
Enables other subsystems to watch actions for a plugin(s).

This will be used specifically for implementing plugins on swarm where a
swarm controller needs to watch the state of a plugin.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 72c3bcf2a533a827402945e3a55872e2db4fb024
Component: engine
2017-07-06 14:26:06 -04:00
Aaron Lehmann f002184455 progress: Light refactor
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c9b92a328d
Component: cli
2017-07-06 10:40:35 -07:00
Deborah Gertrude Digges 4ad1d46962 Add link to docker.com in README.md
- Update README with the link to docker.com

Signed off by Author:    Deborah Gertrude Digges <deborah.gertrude.digges@gmail.com>

Signed-off-by: ddigges <deborahgertrude_digges@intuit.com>
Upstream-commit: f63ec3d87467419a94f827939a1eaefa03b2f181
Component: engine
2017-07-06 23:09:54 +05:30
Yassine TIJANI b0f07c55f2 fixing SIGSEGV when running containers
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>

moving the deffering of the close after the error checking

Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>

fixing SIGSEGV when running containers

Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
Upstream-commit: 45b0e7cf1a
Component: cli
2017-07-06 18:57:36 +02:00
yangshukui 7668114cba Fix docker cp dir with hard link
docker run --name=test ubuntu /bin/sh -c "cd /tmp && echo hi > a && ln a b" && docker cp test:/tmp tmp_
test
link /root/tmp/a /root/tmp_/b: no such file or directory

Signed-off-by: yangshukui <yangshukui@huawei.com>
Upstream-commit: d58ffa0364c04d03a8f25704d7f0489ee6cd9634
Component: engine
2017-07-06 17:03:38 +08:00
Vincent Demeester e249ded12b Merge pull request #211 from ksouf/issue-37-add-tests-on-commands
adding network_create tests 
Upstream-commit: 1aa82bc7df
Component: cli
2017-07-06 08:59:15 +02:00
Aaron Lehmann e839364f20 Merge pull request #296 from thaJeztah/fix-error-overwrite
Fix error variable being overwritten
Upstream-commit: e672589ec0
Component: cli
2017-07-05 19:26:27 -07:00
Sebastiaan van Stijn 9691a9deb1 Merge pull request #33941 from thaJeztah/update-api-docs
Add missing API documentatoin for DataPathAddr
Upstream-commit: 9d95740dbfb790b3ea531a363697076ffb97a294
Component: engine
2017-07-05 18:35:45 -07:00
Sebastiaan van Stijn c36d6e2e41 Merge pull request #33859 from tonistiigi/session-includepaths
Add path filtering to build session client
Upstream-commit: 19ee87361685ae63aa2eca4a2ae5a2035484814b
Component: engine
2017-07-05 18:21:48 -07:00
Sebastiaan van Stijn 74d8ac0d96 Merge pull request #33897 from cpuguy83/jsonfile_log_blocking
Fix log readers can block writes indefinitely
Upstream-commit: db8c2651b84c681579389bb57d309a3b210a7e78
Component: engine
2017-07-05 18:21:14 -07:00
Tibor Vass 096ae0539f Merge pull request #33898 from crosbymichael/swappiness
Do not set -1 for swappiness
Upstream-commit: 490b55e8fa73be4c78de0118fe63a7ce5dc0f383
Component: engine
2017-07-05 17:04:08 -07:00
Andrew Hsu b9da7abd2e Merge pull request #19 from seemethere/increment_to_ga
Increment RPM changelog to docker-ce 17.06.0-ce
Upstream-commit: d6cdd2cd4edc041e0887b741ae11ae9e925eb055
Component: packaging
2017-07-05 15:59:25 -07:00
Andrew Hsu 8172ee629e Merge pull request #26 from seemethere/add_operating_instructions
Adds operating instructions
Upstream-commit: b970db134960bcb7c18ce7f41667554a4efc8761
Component: packaging
2017-07-05 15:59:06 -07:00
khaled souf 259b5f4251 adding unit tests to network
Signed-off-by: khaled souf <khaled.souf@gmail.com>
Upstream-commit: 57c1551991
Component: cli
2017-07-06 00:54:30 +02:00
Sebastiaan van Stijn a9905bfdd7 Fix error variable being overwritten
The `err` variable was set in a loop, so only
the last result was taken into account to return
"failure" or not.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4d4c789cac
Component: cli
2017-07-05 13:54:57 -07:00
Daniel Nephin 5f5ef4ba5a Add parallelism to cross build
Reusable docker engine

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1eb66d60bd
Component: cli
2017-07-05 15:23:32 -04:00
Brian Goff 2aedd8b160 Fix log readers can block writes indefinitely
Before this patch, a log reader is able to block all log writes
indefinitely (and other operations) by simply opening the log stream and
not consuming all the messages.

The reason for this is we protect the read stream from corruption by
ensuring there are no new writes while the log stream is consumed (and
caught up with the live entries).

We can get around this issue because log files are append only, so we
can limit reads to only the section of the file that was written to when
the log stream was first requested.

Now logs are only blocked until all files are opened, rather than
streamed to the client.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e2209185ed1c959131d4068ec7fc93e194dc0802
Component: engine
2017-07-05 14:04:52 -04:00
Daniel Nephin 2af533daad Remove duplication in task formatting.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0030bfea9f
Component: cli
2017-07-05 13:40:47 -04:00
Daniel Nephin 6d92cf3a08 Fix stream for 'nothing found in stack' message
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fb6deb1077
Component: cli
2017-07-05 13:32:54 -04:00
Brian Goff 73e9cd2c31 Merge pull request #286 from thaJeztah/bump-moby
Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
Upstream-commit: 30933b516b
Component: cli
2017-07-05 09:38:32 -04:00
Yang Pengfei 14554f495c Fix run docker rename <container-id> new_name concurrently, the container will have multi names
When run `docker rename <container-id> new_name` concurrently, every operation will release
container's old name. So container will have multi new names reserve in nameIndex.

Signed-off-by: Yang Pengfei <yangpengfei4@huawei.com>
Upstream-commit: cc2340689c431504689d01c9516b3a340b2e8dbc
Component: engine
2017-07-05 16:56:31 +08:00
Akihiro Suda 64645433a6 pkg/archive.FileInfoHeader: fill file type bits
Go 1.9 (golang/go@66b5a2f) removed file type bits from
archive/tar.FileInfoHeader().

This commit ensures file type bits are filled even on Go 1.9 for
compatibility.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 1a451d9a7bb9cd7d437b42d4e73b0560fbf84348
Component: engine
2017-07-05 05:24:32 +00:00
Sebastiaan van Stijn 9c9fdfadf7 update tests for new image struct
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e8080dd7e5
Component: cli
2017-07-04 20:34:24 -07:00
Sebastiaan van Stijn 542cf421f5 Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
Includes changes from;

- Add a LastTagTime for images (https://github.com/moby/moby/pull/31497)
- Fix handling of remote "git@" notation (https://github.com/moby/moby/pull/33696)
- Move some `api` package functions away (https://github.com/moby/moby/pull/33798) (related to https://github.com/docker/cli/pull/236)
- Set ping version even on error (https://github.com/moby/moby/pull/33827)
- Do not add duplicate platform information to service spec (https://github.com/moby/moby/pull/33867)
- Refactor MountPoint Setup function in volume.go (https://github.com/moby/moby/pull/33890)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 366d3ec971
Component: cli
2017-07-04 20:23:38 -07:00
Vincent Demeester 36ea5491ac Merge pull request #287 from thaJeztah/use-v1.0.0-tag-for-go-difflib
Use v1.0.0 tag for go-difflib
Upstream-commit: dc9feff879
Component: cli
2017-07-04 17:32:00 +02:00
Daniel Nephin 2a3613893d Merge pull request #276 from adshmh/add-unit-tests-to-checkpoint-package
add unit tests to checkpoint package
Upstream-commit: 3554d02f33
Component: cli
2017-07-04 11:17:25 -04:00
Vincent Demeester 9fdb37ee64 Merge pull request #288 from thaJeztah/bump-go-winio
Bump go-winio to 0.4.2
Upstream-commit: e08cb59c8a
Component: cli
2017-07-04 16:59:32 +02:00
Victor Vieux 5305c7b28b Merge pull request #248 from albers/completion-network-create--scope
Add bash completion for `network create --scope|--config-only|config-from`
Upstream-commit: 306212574a
Component: cli
2017-07-04 16:48:18 +02:00
Victor Vieux 58665dca40 Merge pull request #246 from albers/completion-prune--filter-label
Add bash completion for `label` filter of `prune` commands
Upstream-commit: 1f45f1b5f9
Component: cli
2017-07-04 16:44:23 +02:00