Commit Graph
27682 Commits
Author SHA1 Message Date
Alexander Morozov 3fec85512c integration: wait for task running in TestServiceHealthRun
Test can miss Starting state, so wait until its Running

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2de05de98dc096de9e774aa5b520ab8f6862de0c
Component: engine
2016-09-29 07:44:00 -07:00
Kenfe-Mickael Laventure 367a83c11c Add DiskUsage method to SystemApiclient
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: f830d52dd022f3a5c234908f9c8654ad279d6f6a
Component: engine
2016-09-29 07:42:53 -07:00
Kenfe-Mickael Laventure 5cfd36294b Add subcommand prune to the container, volume, image and system commands
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 280c8723667af385e0807a090ddc5cc57c46807e
Component: engine
2016-09-29 07:42:53 -07:00
Kenfe-Mickael Laventure 2850aab072 Add /{containers,volumes,images}/prune API endpoint
These new endpoints request the daemon to delete all resources
considered "unused" in their respective category:
  - all stopped containers
  - all volumes not attached to any containers
  - images with no associated containers

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 33f4d68f4dc0506382c31b908905480ab0e559fa
Component: engine
2016-09-29 07:42:53 -07:00
Kenfe-Mickael Laventure 04e5c4c974 Add /system/df API endpoint
This endpoint return data regarding the space used by docker on disk

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: f2e11fb8d1284626d40bb916ad6a21a316e5ab9c
Component: engine
2016-09-29 07:42:53 -07:00
Kenfe-Mickael Laventure 8c08789756 Update Images() to allow retrieving specific image size data
Those data include:
 - size of data shared with other images
 - size of data unique to a given image
 - how many containers are using a given image

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: b717de5153db503fae61c11e30f04f400f66a6fd
Component: engine
2016-09-29 07:42:53 -07:00
Kenfe-Mickael Laventure f0f455579a Add Size and RefCount fields to types.Volume
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: c6db1e9c1b1c015a69a37e4efc570cb44d801168
Component: engine
2016-09-29 07:42:53 -07:00
Kenfe-Mickael Laventure c643e4b3fd Add Map() method to LayerStore interface
This method return a map associating a chain ID to its layer object

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 148aef9199ef0af6d03ea53e616c9fbd23b7c5ec
Component: engine
2016-09-29 07:42:53 -07:00
Michal Minář 225daecbb2 Different number of retries for layers of different sizes
Classify blobs into three categories based on size.
Use a very limited number of mount attempts and no existence check for
small blobs. Use more attempts for bigger blobs.

Also remember blob associations during layer existence check.

Blob digests are now checked in the target repository from newest to
latest. If the blob exists and the metadata entry does not, it will be
created. If the blob is not found, the metadata entry will be removed.

Signed-off-by: Michal Minář <miminar@redhat.com>
Upstream-commit: 81f7b1f1e50252e9fdd52111f0899d59f19ecb87
Component: engine
2016-09-29 14:16:01 +02:00
Michal Minář ea26fddd8a Allow to mock V2MetadataService in unit tests
Signed-off-by: Michal Minář <miminar@redhat.com>
Upstream-commit: d3bd14a4fb7513688644479da09e701bdcd00dc7
Component: engine
2016-09-29 14:16:00 +02:00
Michal Minář 67a7e47787 Try to cross-repo mount until success
Don't fallback back immediately to blob upload if the cross-repo mount
fails and layer upload is initiated by registry.

Instead cancel the upload and re-try cross-repo mount from different
source repository before doing full re-upload.

Signed-off-by: Michal Minář <miminar@redhat.com>
Upstream-commit: c6dd51c32cfccc06e77b4f7cb2358f788753df72
Component: engine
2016-09-29 14:16:00 +02:00
Michal Minář fa7c15d2df Compare V2Metadata with associated auth config
to avoid unnecessary blob re-uploads.

Cross repository mount from particular repo will most probably fail if
the user pushing to the registry is not the same as the one who pulled
or pushed to the source repo.

This PR attempts first to cross-repo mount from the source repositories
associated with the pusher's auth config. Then it falls back to other
repositories sorted from the most similar to the target repo to the
least.

It also prevents metadata deletion in cases where cross-repo mount fails
and the auth config hashes differ.

Signed-off-by: Michal Minář <miminar@redhat.com>
Upstream-commit: 0928f3f2e3eda75a295b651d27f9dd992fd951a4
Component: engine
2016-09-29 14:16:00 +02:00
allencloud 8493b1e3af add \n in engine labels display in docker node inspect xxx --pretty
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ddec4c3ee4e51cb62060f752777bdd32e86607e3
Component: engine
2016-09-29 18:17:54 +08:00
Sebastiaan van Stijn 3e0303bb32 Merge pull request #27001 from mstanleyjones/fix_broken_build
Fix link to non-existent file
Upstream-commit: ad398f132ba9708cf4a7a60ef5a4e7f5b566b000
Component: engine
2016-09-29 08:39:26 +02:00
Sebastiaan van Stijn cd2885f204 Merge pull request #26999 from andrewhsu/test-exit-code-125
integration test for missing arg error code
Upstream-commit: bc0465d2bec1dbb47ffb0d77a16cd3f9d2c7237c
Component: engine
2016-09-29 08:38:19 +02:00
Misty Stanley-Jones 3f1e962107 Fix link to non-existent file
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: ca04f02d7655e7306c7c0cde6fa1895a14f0a673
Component: engine
2016-09-28 20:34:26 -07:00
Andrew Hsu aa6c254ed2 integration test for missing arg error code
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 64b5fe76cff87784124a3d2d824d99ec9ce3b5c2
Component: engine
2016-09-28 16:33:45 -07:00
John Howard c01ac0b550 Windows: Don't set PATH/TERM on exec
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e880bbc48bd94762489a9948814d3edea39fdcfa
Component: engine
2016-09-28 13:42:27 -07:00
Vincent Demeester ac8256a95d Merge pull request #26972 from allencloud/clear-health-monitor-log
make health check log more readable
Upstream-commit: 601004e1a714d77d3a43e957b8ae8adbc867b280
Component: engine
2016-09-28 14:22:43 +02:00
Sebastiaan van Stijn 8a19fb43a4 Merge pull request #26941 from runcom/docker-init-path-1
configure docker-init binary path
Upstream-commit: 9f0593990f6d8ac95a5dde312e0b7401b472cfb9
Component: engine
2016-09-28 13:12:59 +02:00
Vincent Demeester 48a609d72c Add a new "is-task" ps filter
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5280ba83e55b94b9d4973a15381e18eb10920233
Component: engine
2016-09-28 12:45:30 +02:00
Vincent Demeester f6b8936533 Merge pull request #24850 from yongtang/24270-service-tasks-filter
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
2016-09-28 11:50:27 +02:00
allencloud a7102311d0 make health check log more readable
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a4a4f3733f18053269293d6f2e56767c564940d3
Component: engine
2016-09-28 14:10:15 +08:00
Yong Tang d295583beb Update docs for service ps
This fix updates docs for `service ps` as now the TASK ID part has been
removed.

Also, this fix fixes several incorrect sample output.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 880a5f565fb33b445977bb2ded0fc375edee0c40
Component: engine
2016-09-27 19:12:48 -07:00
Brian Goff 66d6bcea36 Merge pull request #26951 from AkihiroSuda/update-ut-cli-command-service
Fix cli/command/service/opts_test.go, and add some extra test cases
Upstream-commit: 9a2f01ef13e4bb54813aa548c2d44a8e3bafecd2
Component: engine
2016-09-27 20:30:26 -04:00
Misty Stanley-Jones 048d1e7728 Merge pull request #26931 from thaJeztah/fix-aux-address-example
Fix incorrect aux-address examples and test
Upstream-commit: bab64af2ad0d6f5e7c1e9d54b2f6d93096f7b99f
Component: engine
2016-09-27 17:06:01 -07:00
Misty Stanley-Jones 10fe66aea1 Merge pull request #26963 from londoncalling/docs-swarm-d4mac-d4win
added better Docker Machine links to Swarm tutorial d4mac, d4win, cop…
Upstream-commit: 456e6fe4aa9804b278e136a395d5d4b6dd766763
Component: engine
2016-09-27 14:59:26 -07:00
Victoria Bialas 95fdcb0f29 added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc
Component: engine
2016-09-27 14:21:17 -07:00
Sebastiaan van Stijn 393b93c599 Merge pull request #26957 from dnephin/add_more_areas
Add area/bundles to the list of area labels
Upstream-commit: 784b601bbd432c710db1a6205b5ac712812dbab5
Component: engine
2016-09-27 22:01:51 +02:00
John Howard 434bea436a Remove hacked Windows OCI spec, compile fixups
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 02309170a5fb97d40260d0ee9e24b44be8c780b2
Component: engine
2016-09-27 12:07:35 -07:00
John Howard 2028ec4919 Revendor OCI runtime-spec 1c7c27d043c2
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ba2df174935b5119f336e7f3ab5228cd41279791
Component: engine
2016-09-27 12:05:47 -07:00
Sebastiaan van Stijn e2b3c90bc3 Merge pull request #26955 from albers/completion-fix-logs--since
Fix bash completion for `docker logs --since`
Upstream-commit: e8dc339d43e3bccf48a90ef14ac5e6f05f72a478
Component: engine
2016-09-27 20:06:40 +02:00
Daniel Nephin 63b81800ef Add area/bundles tothe list of area labels.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b94d429f19b900850c3c4a91083d87dc190d4b98
Component: engine
2016-09-27 13:18:53 -04:00
Victor Vieux 09c1674077 Merge pull request #26952 from andrewhsu/cherry-pick-flags
Specify git cherry-pick flags for release process.
Upstream-commit: 95030c26e41d8120d00ce44299599c27ef7b1de2
Component: engine
2016-09-27 10:08:01 -07:00
Harald Albers 9c391e0cdf Fix bash completion for docker logs --since
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e2244352a79f5d23cf874d72b6abed9be2da9f8
Component: engine
2016-09-27 18:58:48 +02:00
Vincent Demeester be83d1256c Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress
make client side know container removal in progress
Upstream-commit: 97d4b9c46528c2d263a448658a6cf78ffd943075
Component: engine
2016-09-27 18:48:03 +02:00
Vincent Demeester 4ab44ced86 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: b881148385685f3c538a3a085207bfdf30ae9213
Component: engine
2016-09-27 18:46:51 +02:00
Vincent Demeester 0b8cdf7c7b Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs
move macvlan out of experimental docs
Upstream-commit: 64fca3486082cfd59aac32d2cfd9e07b6f62a112
Component: engine
2016-09-27 18:45:00 +02:00
Vincent Demeester cc821d1b32 Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty
add endpoint mode in service pretty
Upstream-commit: c505486bb195a3a413bacff7cfdee8d6931d529f
Component: engine
2016-09-27 18:28:43 +02:00
Andrew Hsu db124038c0 Specify git cherry-pick flags for release process.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 6d470bb715d071cc91e51bb857099d0d90182ce2
Component: engine
2016-09-27 09:03:20 -07:00
Akihiro Suda 9cd15b6f6f Fix cli/command/service/opts_test.go, and add some extra test cases
`m.Set("type=volume,target=/foo,volume-nocopy")` is valid even though it lacks "source"

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 4e01e7924da92c94faf675cbf35b01985c3cd999
Component: engine
2016-09-27 15:27:02 +00:00
Alexander Morozov 0cc382f1ee Merge pull request #26920 from tophj-ibm/add-1404-make-debs
ppc64le: add files for supporting 14.04 'make debs'
Upstream-commit: 1dbf3c65e15a2d021cc15ded9caaf6192d58970b
Component: engine
2016-09-27 07:54:57 -07:00
Brian Goff fa6f37076c Merge pull request #26898 from YuPengZTE/devErrorsNew
In error, the first letter is low-case letter
Upstream-commit: c2f57291ac04a1d582d7fcdedda7b1ad707543d5
Component: engine
2016-09-27 10:10:57 -04:00
Sebastiaan van Stijn c784282cca Merge pull request #25697 from yongtang/24958-swarm-init-cluster-defaults
Let swarmkit to handle cluster defaults in `swarm init` if not specified
Upstream-commit: 6e5d5baaed595c654cd3afa04ee3a0c1c6b84fd8
Component: engine
2016-09-27 15:36:03 +02:00
Antonio Murdaca 195692ee1c configure docker-init binary path
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 6a12685bb7eaa5744c5a115ffe12f3a4d80093bb
Component: engine
2016-09-27 14:49:17 +02:00
Yong Tang 562ec15f92 Let swarmkit handle cluster defaults in swarm init if not specified
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).

This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.

This fix fixes 24958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: eb19c2f080f624d8b0186f8037cdc1f7d8ada402
Component: engine
2016-09-27 04:19:38 -07:00
Justin Cormack 0218ffcf08 Merge pull request #26921 from tophj-ibm/bump-remaining-go-versions-to-1.7.1
Bump remaining Dockerfile go versions to 1.7.1
Upstream-commit: 789e6868904d724ed56fe4b141b4b557f477f1ca
Component: engine
2016-09-27 11:51:56 +01:00
allencloud 99ee0aae26 add endpoint mode in service pretty
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 70bb832060ae1a0525a34145f85e68e0da78fcb9
Component: engine
2016-09-27 18:41:19 +08:00
allencloud 672761b64e make client side know container removal in progress
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 9a58f298d182945eb2b820e5e3539b754fdaa751
Component: engine
2016-09-27 18:06:54 +08:00
Vincent Demeester 67175b8b48 Merge pull request #24634 from thaJeztah/make-network-name-required
API return network-list if no network-name or id is provided
Upstream-commit: b826bebda0cff2cc2d3083b954c810d2889eefe5
Component: engine
2016-09-27 10:20:38 +02:00