toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,115 Commits 3 Branches 295 Tags
3b1269cdeb3c6c710ebb5c40b0616820eae54b02
Commit Graph
27115 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Lehmann 3b1269cdeb Merge pull request #25523 from dmcgowan/fsync-layer-filestore 
Update layer store to sync transaction files before committing
Upstream-commit: bc06542a1715273acc087dadd8179a88386dd6fb
Component: engine
 2016-09-08 10:03:12 -07:00
Michael Crosby 45864fd48e Merge pull request #26397 from crosbymichael/rm-vendor-api 
Remove unused engine-api packages
Upstream-commit: d579e24ad282b05e53bfb31313e4632e14f46652
Component: engine
 2016-09-08 10:00:51 -07:00
Madhu Venugopal 9fa1fb8eb9 Merge pull request #25962 from mrjana/net 
Add support for docker run in swarm mode overlay
Upstream-commit: 719a640743604105d8eb029613c6d976163cea91
Component: engine
 2016-09-08 09:39:00 -07:00
Brian Goff 0bb5674bf4 Merge pull request #26205 from allencloud/fix-warnings-append 
add warnings when verifying container settings
Upstream-commit: b1dfefc4bb76c48a75f07d8c478b16863266bced
Component: engine
 2016-09-08 12:10:37 -04:00
Vincent Demeester 77b48e7428 Merge pull request #26252 from leslau/master 
Fixed custom daemon options on systemd docs still using -H fd://
Upstream-commit: 7baa09faa02ad93dcb0e103abde3c45862fc903c
Component: engine
 2016-09-08 17:15:13 +02:00
Brian Goff 5c0c4a4b23 Merge pull request #25578 from rwilliams/conemu 
Force input stream ANSI emulation for ConEmu.
Upstream-commit: 28d18b8205c813e18af96f0eb88850b2734077f4
Component: engine
 2016-09-08 11:12:33 -04:00
Brian Goff 774225b30e Merge pull request #26228 from lixiaobing10051267/masterPluginRm 
check inconsistant command in docs/reference/commandline
Upstream-commit: e96c0fafa0465e7d1a3a12fda820c16d0449f814
Component: engine
 2016-09-08 11:09:18 -04:00
Brian Goff cc5c9f50ef Merge pull request #25777 from swernli/servicing_race 
Fixing race in Windows container servicing
Upstream-commit: 4219c0018f129bf50d1c7f8b7ab05c2659d88dfa
Component: engine
 2016-09-08 10:42:15 -04:00
Jana Radhakrishnan f0d30a4b26 Add support for docker run in swarm mode overlay 
This PR adds support for running regular containers to be connected to
swarm mode multi-host network so that:
    - containers connected to the same network across the cluster can
      discover and connect to each other.
    - Get access to services(and their associated loadbalancers)
      connected to the same network

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 99a98ccc14a9427be47c8006e130750710db0a16
Component: engine
 2016-09-07 21:20:41 -07:00
Sven Dowideit 33561ab95c Merge pull request #24586 from farcaller/gcplogs 
Added optional flags to init gcp logger metadata
Upstream-commit: 5be6ccc433e8c9207c67087304dfb72fa00ba544
Component: engine
 2016-09-08 13:47:48 +10:00
Brian Goff 8bc9e6240b Merge pull request #25891 from Microsoft/jjh/processlist 
Windows: Docker top implementation
Upstream-commit: 48c615f853161f2630ab1df039b6f1169de7c129
Component: engine
 2016-09-07 20:58:20 -04:00
Alexander Morozov 87e9af6d92 Merge pull request #26395 from unclejack/bump_go_to_1.7.1 
Dockerfile*: bump Go to 1.7.1
Upstream-commit: e482d8472b7212f8e9fe13c33f12e8206393dcb5
Component: engine
 2016-09-07 17:17:38 -07:00
Tõnis Tiigi 057c226c2d Merge pull request #25806 from Microsoft/jjh-missingdigest 
Don't fail daemon start on missing layer
Upstream-commit: b890d475f7ad128c70cfa49274d1a4cd3fe1109f
Component: engine
 2016-09-07 16:35:27 -07:00
John Howard 29459f6822 Windows: docker top implementation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 52f0474851298e7ba70b1a7ea16e3421d5926c98
Component: engine
 2016-09-07 16:29:02 -07:00
Michael Crosby 4f702dbddb Remove unused engine-api packages 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c612147a532921f68bb7a8476d51a6f312e0dfab
Component: engine
 2016-09-07 15:55:13 -07:00
Jana Radhakrishnan 690d211fb6 Vendor libnetwork @00e7660daeb4 
- Fixes #25325
  - Fixes certain issues with workers leaving swarm and rejoining
  - Adds cluster provider interface methods to support docker run on
    overlay in swarm mode.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 99c39680984018b345881a29d77a89f87958a57b
Component: engine
 2016-09-07 15:11:48 -07:00
unclejack a75b486d92 Dockerfile*: bump Go to 1.7.1 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 1668894d0400f1b6446ce0db2d92ad14ea97014d
Component: engine
 2016-09-08 00:42:35 +03:00
Brian Goff 6aa1b8a3eb Merge pull request #26378 from rhvgoyal/fix-max-retries 
devmapper: Fail to start container if xfs_nospace_max_retries can't be enforced
Upstream-commit: ce5eb34e68ec84505ede64efa9cfc9b8d177f086
Component: engine
 2016-09-07 16:56:45 -04:00
John Howard 7549abdea0 Windows: Skip layers+base images 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 540c8e9b201cfcf46cf9d2c05d42c492edda4117
Component: engine
 2016-09-07 12:16:45 -07:00
Jana Radhakrishnan 97719e4178 Vendor swarmkit @27fbaef4ceed6 
Adds a new task runtime to support network attachmemt for plain old
docker containers so that they can participate multi-host networks and
get access to services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 39143ef15d6b95acc37f209c8ba5ebc4b3d57c79
Component: engine
 2016-09-07 11:52:49 -07:00
Charles Smith 2280ed4544 Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker 
Rewrites to Understanding Docker topic for clarity
Upstream-commit: 426a0af0759798d8e3332b38236ee40df6d14798
Component: engine
 2016-09-07 11:36:58 -07:00
Michael Crosby 696033b6f3 Merge pull request #26349 from crosbymichael/api-to-docker 
Move engine-api to docker
Upstream-commit: 3ea762b9f6ba256cf51bd2c35988f0c48bccf0b0
Component: engine
 2016-09-07 11:08:11 -07:00
Michael Crosby 60a22c207c Move engine-api client package 
This moves the engine-api client package to `/docker/docker/client`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7c36a1af031b510cd990cf488ee5998a3efb450f
Component: engine
 2016-09-07 11:05:58 -07:00
Michael Crosby 45ddc4bfcb Add engine-api types to docker 
This moves the types for the `engine-api` repo to the existing types
package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 91e197d614547f0202e6ae9b8a24d88ee131d950
Component: engine
 2016-09-07 11:05:58 -07:00
Vivek Goyal 30755d9f2c devmapper: Fail to start container if xfs_nospace_max_retries can't be enforced 
We just introduced a new tunable dm.xfs_nospace_max_retries. But this tunable
will work only on new kernels where xfs supports this feature. On older
kernels xfs does not allow tuning this behavior.

There are two issues. First one is that if xfsSetNospaceRetries() fails,
it returns error but leaves the device activated and mounted. We should
be unmounting the device and deactivate it before returning.
 
Second issue is, if docker is started on older kernel, with
dm.xfs_nospace_max_retries specified, then docker will silently ignore the
fact that /sys file to tweak this behavior is not present and will continue.
But I think it might be better to fail container creation/start if kernel
does not support this feature.

This patch fixes it. After this patch, user will get an error like following
when container is run.

# docker run -ti fedora bash
docker: Error response from daemon: devmapper: user specified daemon option dm.xfs_nospace_max_retries but it does not seem to be supported on this system :open /sys/fs/xfs/dm-5/error/metadata/ENOSPC/max_retries: no such file or directory.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 6cc55dd65b363fe520c2ab29a9303f79afd4cadb
Component: engine
 2016-09-07 14:03:01 -04:00
Misty Stanley-Jones 5133a883a8 Rewrites to Understanding Docker topic for clarity 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 12b740b65c88f6225241fe9a73575ec083ddba5d
Component: engine
 2016-09-07 11:02:03 -07:00
Tõnis Tiigi a1f4f932da Merge pull request #26342 from cpuguy83/20079_restore_volume_migrate 
restore migrating pre-1.7.0 volumes
Upstream-commit: a6daa94e3e0c1a60ba054eddc819c77a5dcc78b9
Component: engine
 2016-09-07 10:56:07 -07:00
Charles Smith e42ce8aa21 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
Upstream-commit: 6f0502b89b29a7d23b02363d02104ec531a36e4a
Component: engine
 2016-09-07 10:38:59 -07:00
Aaron Lehmann 19d0c0f4d5 Merge pull request #23100 from runcom/fix-stores 
support legacy registries in exernal stores
Upstream-commit: 86124ca04b4b0ff4096ca95626e7864692edeadf
Component: engine
 2016-09-07 09:44:41 -07:00
Brian Goff 862dc7d3e1 Merge pull request #26209 from allencloud/validate-heartbeat-in-discovery 
validate heartbeat in discovery cluster opts
Upstream-commit: 94cfa2cc37ea4648fbf45275f345870e4ff26387
Component: engine
 2016-09-07 12:11:53 -04:00
Brian Goff 6b6c93e68e Merge pull request #26376 from dnephin/remove_manpagegen_from_main_dockerfile 
Remove download of man page generator dependencies
Upstream-commit: 4f8ca4797777ee9ed7fa6fbcc33080128c04051e
Component: engine
 2016-09-07 11:47:01 -04:00
Brian Goff d707942138 Merge pull request #26345 from albers/completion-events-health_status 
Add completion for `docker events -f event=health_status`
Upstream-commit: 93c915b385f84d8dd2f6c03e64c4d204664fcc82
Component: engine
 2016-09-07 11:38:33 -04:00
Brian Goff 03938c05b0 Merge pull request #26115 from yongtang/08292016-info-registry-mirrors 
Add registry mirrors information in the output of `docker info`
Upstream-commit: 6168e98a13ee4d226fe96c5afbe672065ddf2c8e
Component: engine
 2016-09-07 11:37:36 -04:00
Daniel Nephin a8af3835c4 Merge pull request #26269 from yuexiao-wang/remove-option 
Remove the option for the command service rm
Upstream-commit: 20607e2cc20662453226938e4fe0d7ca40fc6ae7
Component: engine
 2016-09-07 11:31:11 -04:00
Daniel Nephin bcba22b38e Remove download of man page generator dependencies, which are now in man/Dockerfile.\* 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d0fa13a50201cdcef849b0c2ae67b0747222a1c6
Component: engine
 2016-09-07 11:02:51 -04:00
Vincent Demeester 01c442fe23 Merge pull request #26275 from cpuguy83/verify_integration_tests 
Fail faster if integration tests don't compile
Upstream-commit: a0bbf54aa70b590fab33c916ad77573a62d69bf9
Component: engine
 2016-09-07 16:48:14 +02:00
Sven Dowideit 64292ad8e2 Merge pull request #26218 from frosforever/fix_run_reference_typo 
Correct typo in run reference docs that use the create command
Upstream-commit: e73e37f11206a346d2a552c5d133112cd103d562
Component: engine
 2016-09-07 22:18:26 +10:00
Brian Goff f7033e2549 Merge pull request #26347 from anusha-ragunathan/plugins-libnetwork 
Adding pluginv2 support for libnetwork.
Upstream-commit: cb6ea5b4f5ff4072add096ca6b0c0fcabc14c99d
Component: engine
 2016-09-07 08:04:34 -04:00
Vincent Demeester a1c81636a2 Merge pull request #26362 from lixiaobing10051267/masterIfconfig 
rectify some response information while execute ifconfig in container
Upstream-commit: 0ebb18102f376ee42ecc97d159842737ff73568d
Component: engine
 2016-09-07 11:25:25 +02:00
Vincent Demeester 5e84d04020 Merge pull request #26355 from stevvooe/correct-context-order 
api/client/node: correct ordering in context argument
Upstream-commit: 52c55cf19b9ff47879fe7a9265c858606228ab4b
Component: engine
 2016-09-07 11:23:56 +02:00
Vincent Demeester c44fd4c927 Merge pull request #26352 from Microsoft/jjh/volumenocopydata 
Windows: Correct TestVolumesNoCopyData
Upstream-commit: a51fcc26fa14c92b5bee8896c738943a29e38818
Component: engine
 2016-09-07 11:23:10 +02:00
Antonio Murdaca 4eb86a788b support legacy registries in exernal stores 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 67d752ac55869eab42280947ad37ff5e1468d458
Component: engine
 2016-09-07 09:45:42 +02:00
lixiaobing10051267 94b406a933 rectify some response information while execute ifconfig in container 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 97bbfc353450602b358dfa6231faf240744b9967
Component: engine
 2016-09-07 13:19:46 +08:00
Doug Davis 2f7517f2b1 Merge pull request #26360 from lixiaobing10051267/masterServiceCreate 
remove some incorrect bash symbols
Upstream-commit: a8f79e554270084db03a3916a7271b257ab17801
Component: engine
 2016-09-06 23:51:23 -04:00
lixiaobing10051267 4de3f43e65 remove some incorrect bash symbols 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 2d1d4684f0fc752aae7e41af03a0f1589f11ee00
Component: engine
 2016-09-07 11:44:54 +08:00
Brian Goff a0f654ae38 Merge pull request #26340 from Microsoft/jjh/blocksinglefilevolume 
Windows: Error if mapping single file volume
Upstream-commit: a123ef1bfa8d52a599ab4e178e0505b54a423126
Component: engine
 2016-09-06 21:06:15 -04:00
Brian Goff 669392fd60 Merge pull request #26281 from LK4D4/fix_multireader_offset 
pkg/ioutils: fix multireader SEEK_CUR branch
Upstream-commit: 2381c7f18df98b3ccc0b5a1236cd8e4ae57ba912
Component: engine
 2016-09-06 20:47:03 -04:00
Brian Goff 8f83f014e7 Merge pull request #26344 from tophj-ibm/change-test-daemon-id-generation 
Integration-cli: change daemon id generation from time to rand
Upstream-commit: 6ae6739af445ec59d9cb9f35f1729ab55a6d3f7a
Component: engine
 2016-09-06 20:42:58 -04:00
Brian Goff b03700a5d5 Verify integration tests before building bundles 
Adds a new bundle `verify-integration-tests` which pre-compiles a test
binary for the integration tests.

This makes sure that the integration tests will actually compile before
doing other tasks which take much longer, such as building dockerd and
loading test fixtures.
When it comes time to actually run the tests, the pre-compiled binary
will be used so it doesn't have to compile the tests a 2nd time.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4d0275c8192ca39d88f7dbe1e59ec03b544b6696
Component: engine
 2016-09-06 20:27:28 -04:00
Stephen J Day 7321b93433 api/client/node: correct ordering in context argument 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 084ff6dc6da4458e8ca0e4fffa9d133a5d39ee92
Component: engine
 2016-09-06 17:04:43 -07:00