toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,171 Commits 3 Branches 295 Tags
c1c124e07836a4a98e8123b418443c2db22b8d71
Commit Graph
21171 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester c1c124e078 Merge pull request #19193 from Microsoft/jjh/networkapitests 
Windows CI: Turn off network API tests
Upstream-commit: 6175add0e16d275511162f521dafdda7ba8f560c
Component: engine
 2016-01-10 21:18:21 +01:00
Sebastiaan van Stijn 7e1d4c2453 Merge pull request #19195 from Microsoft/jjh/wincifailingtests 
Windows CI: Deal with failing tests for TP4
Upstream-commit: 38f4217bfff1e5aec7457c2acfbe2409759ee830
Component: engine
 2016-01-10 21:18:02 +01:00
Vincent Demeester 26f279a5f0 Merge pull request #19205 from runcom/fix-formats 
integration-cli: fix wrong formats
Upstream-commit: 7b1caafe27c06aae3311f00a9bdee021c3be8b63
Component: engine
 2016-01-10 20:53:11 +01:00
Arnaud Porterie 7e3ab3dcd7 Merge pull request #19198 from sanimej/vin 
Vendoring libnetwork
Upstream-commit: fe3d1f9dd7f2c888ad69034464cba6a35a56018f
Component: engine
 2016-01-10 11:46:34 -08:00
Jess Frazelle e25e21a6d3 Merge pull request #19218 from justincormack/i386_syscalls 
Add i386 specific modify_ldt syscall to default seccomp filter
Upstream-commit: 274558881ae5d2fcf3a3d72c31d4fde9e415dcbc
Component: engine
 2016-01-10 09:34:56 -08:00
Justin Cormack fd32c5b230 Add i386 specific modify_ldt syscall to default seccomp filter 
This syscall is used by Go on i386 binaries, although not by libc.

Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
Upstream-commit: 13a9d4e8993997b2bf9be7e96a8d7978a73d0b9b
Component: engine
 2016-01-10 12:00:11 +00:00
moxiegirl b9cea74caa Merge pull request #19171 from londoncalling/cloud-installs-redirects 
added re-directs for cloud install docs as clean-up for  #18282
Upstream-commit: 7058495ab8bd358e11e1b06eb90298a0a207d7c5
Component: engine
 2016-01-09 17:43:41 -08:00
Tianon Gravi 675c847472 Merge pull request #19210 from albers/completion--shm-size 
bash completion for `docker {build,create,run} --shm-size`
Upstream-commit: 2a868799bfe48afcb2111a060684cab062054cf6
Component: engine
 2016-01-09 11:05:39 -08:00
Harald Albers 491c316b7d bash completion for docker {build,create,run} --shm-size 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3f6b0f4c7c87f8f8f01e67ea3750015e9dcab9bf
Component: engine
 2016-01-09 09:27:45 -08:00
Antonio Murdaca a18ec5adb2 integration-cli: fix wrong formats 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 5fe38d39e7c7085e53904d6403e8b48274f86e8b
Component: engine
 2016-01-09 11:44:15 +01:00
Tõnis Tiigi a478ae86ba Merge pull request #19167 from vieux/bring_discovery_on_par 
Bring discovery on par with the one in docker/swarm
Upstream-commit: c49ccd319249610eb05f0c430b26d7c82383bf76
Component: engine
 2016-01-08 22:54:01 -08:00
Tõnis Tiigi a6fdd5f023 Merge pull request #19202 from cyli/vendor-notary 
Re-vendoring notary
Upstream-commit: 92b0005a1a31cf14f4836903d0688468b05f4530
Component: engine
 2016-01-08 22:48:18 -08:00
Michael Crosby 5dc0139c60 Merge pull request #18840 from aaronlehmann/trust-messages 
Send push information to trust code out-of-band
Upstream-commit: 2892de760f412360c5effef9cfc346f2d92eaa4c
Component: engine
 2016-01-08 16:56:57 -08:00
cyli 03dfb7ff42 Re-vendoring notary in order to deal with a canonical JSON serialization issue. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 5719b136dec7b2c3e76059cf9226a1b388a772f6
Component: engine
 2016-01-08 16:45:15 -08:00
Michael Crosby 8334f715ad Merge pull request #19199 from crosbymichael/migrate-errors 
Fixed migrate defect, allow migrate the empty directory
Upstream-commit: 0a002f4ba813305a16f4ffb21488865601f0f18e
Component: engine
 2016-01-08 16:37:57 -08:00
andy 8912ced795 Fixed migrate defect, allow migrate the empty directory 
If there is an empty directory exists in the $DOCKER_ROOT/containers ,
that will cause migrate fail. Then docker daemon will initialize failed.
This commit allow skips the empty directory.

Signed-off-by: Andy Zhang <andy.zhangtao@hotmail.com>

Change error messages from uppercase to lowercase

Change error messages from uppercase to lowercase

Signed-off-by: andy <ztao@tibco-support.com>
Upstream-commit: 098fdb6408e4e630c1c78b8283c4bc716cc46698
Component: engine
 2016-01-08 15:44:30 -08:00
Sebastiaan van Stijn 7eedab5098 Merge pull request #18736 from WeiZhang555/tiny-lock 
Break big lock into some tiny locks for containerStart
Upstream-commit: a082f8083212a50b5a3e40e2d2507b78e0a8e6a8
Component: engine
 2016-01-09 00:35:26 +01:00
Santhosh Manohar d8dc8b7d33 Docker changes for libnetwork vendoring.. 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 64a6dc355815261ac438b12a262e3cda7c9181df
Component: engine
 2016-01-08 14:13:55 -08:00
Santhosh Manohar d53ca527b3 Vendoring libnetwork and its dependencies.. 
- replace /etc/hosts based name resolution with embedded DNS for user
  defined networks
- overlay veth cleanup: docker/docker#18814
- check before programming ipv6 in bridge: docker/docker#19139
- diable DAD: docker/docker#18871

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 8ccf5cffa7cd3cfd8e83fdaebc60a9f3d2473bcc
Component: engine
 2016-01-08 14:13:21 -08:00
Alexander Morozov 12ab071eb0 Merge pull request #19135 from Microsoft/jjh/securitywarning 
Windows: Fix security warning regression
Upstream-commit: 807d575b5ef1785ded1038dca2cfbf2afa2d5a0c
Component: engine
 2016-01-08 13:55:41 -08:00
John Howard 8157f678e4 Windows CI: Deal with failing tests for TP4 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 25c383391a951e5bc9cb2f003ce69f119779fb2c
Component: engine
 2016-01-08 13:49:43 -08:00
Tianon Gravi b4fe367544 Merge pull request #19181 from coolljt0725/enable_build_syscall_test 
Make .ensure-syscall-test to use build-arg
Upstream-commit: 335764a5913900283a489ef771013041ffba7230
Component: engine
 2016-01-08 13:43:38 -08:00
John Howard f999a9492a Windows CI: Turn off network API tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4c380010a6c001cda7cbe7184eb298ec885774ce
Component: engine
 2016-01-08 12:58:54 -08:00
Jess Frazelle d3832b1ec4 Merge pull request #19186 from unclejack/no_mail_maintainers 
CONTRIBUTING: add guidelines regarding email
Upstream-commit: 719526d87c17eb65cde9a95048252dd468df99f1
Component: engine
 2016-01-08 12:51:59 -08:00
Arnaud Porterie 783f31c7b2 Merge pull request #19001 from aboch/pip 
Allow user to choose the IP address for the container
Upstream-commit: 05de2aadff97be0ffe8a3ed0cf4ac363d291488f
Component: engine
 2016-01-08 11:49:20 -08:00
Michael Crosby 3fbd578989 Merge pull request #19175 from cpuguy83/18670_copy_data_for_named_volumes 
On create, copy image data for named volumes.
Upstream-commit: e26974e20b7e431b7c6e5a0dd4b7fe1b0127271f
Component: engine
 2016-01-08 11:33:40 -08:00
Aaron Lehmann d2386de2d7 Remove ansiescape package 
api/client/trust.go was the last file that used it.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3f829aa6e436dc741785abd795fdcd28afd2da40
Component: engine
 2016-01-08 10:57:50 -08:00
Aaron Lehmann d54e9ca21b Send push information to trust code out-of-band 
The trust code used to parse the console output of `docker push` to
extract the digest, tag, and size information and determine what to
sign. This is fragile and might give an attacker control over what gets
signed if the attacker can find a way to influence what gets printed as
part of the push output.

This commit sends the push metadata out-of-band. It introduces an `Aux`
field in JSONMessage that can carry application-specific data alongside
progress updates. Instead of parsing formatted output, the client looks
in this field to get the digest, size, and tag from the push.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 65370be888d940899593a001024f53d6b83b4bb0
Component: engine
 2016-01-08 10:57:50 -08:00
Jess Frazelle 61116ea963 Merge pull request #18887 from riyazdf/notary-delegations 
notary delegation integration into docker
Upstream-commit: 1c979f758753d921ced122dec3953ddbc35ee67f
Component: engine
 2016-01-08 10:37:55 -08:00
Alessandro Boch 7467c1af44 Allow user to choose the IP address for the container 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 2bb3fc1bc522059e9be5bd967b6a5c49917f5d0c
Component: engine
 2016-01-08 10:09:16 -08:00
Alessandro Boch f1d228a431 Vendoring libnetwork 
- 49c24217054e269aad3dbfd81ee32780b104dd84

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 19b063e740c8140c70bac65179f944422538babc
Component: engine
 2016-01-08 09:19:31 -08:00
Riyaz Faizullabhoy 1ce594cbcd update tests and error messages, revendor notary with tag 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c32a66877f2ddc3f1cce66d78c69e032d6cf795
Component: engine
 2016-01-08 09:11:33 -08:00
unclejack 1739126af0 CONTRIBUTING: add guidelines regarding email 
This adds guidelines around reaching the maintainers. Emails shouldn't
be sent to maintainers. GitHub mentions should be used instead.

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 64e8fa9199fb345e017c8ef5299ca69cee01ab4c
Component: engine
 2016-01-08 16:49:17 +02:00
Vincent Demeester c67324aed2 Merge pull request #19180 from coolljt0725/fix_flaky_test 
Fix flaky testTestStatsAllNewContainersAdded
Upstream-commit: 3a8d694e01d8c3353f49a3f220ee861769f8b4a5
Component: engine
 2016-01-08 13:10:27 +01:00
Antonio Murdaca 68fdf5d8eb Merge pull request #19058 from dnephin/move_opts_to_runconfig_opts 
Move some opts validators to runconfig/opts where they are used
Upstream-commit: 018081d5a9acadb218e1284b11b200418aef5e0f
Component: engine
 2016-01-08 12:34:49 +01:00
Antonio Murdaca 04c25bef6f Merge pull request #19131 from cpuguy83/fix_plugin_error_handling 
Don't error out on plugin err with json
Upstream-commit: f4f848b7a55f142befd13b76803d7d884f815419
Component: engine
 2016-01-08 12:22:45 +01:00
Antonio Murdaca 2f9e2cb95f Merge pull request #19179 from estesp/btrfs-userns-perms 
Fix btrfs subvolume snapshot dir perms for user namespaces
Upstream-commit: 9e9d7dc8845cfa4bf46d46b8e0b68b16c8c038f7
Component: engine
 2016-01-08 12:13:49 +01:00
Lei Jitang 1857956503 Fix flaky test TestStatsAllNewContainersAdded 
Wait the new created container for running and then check if it
is in the docker stats to avoid flaky test.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 71d6e71cff4122a987a4655723d50a296916f523
Component: engine
 2016-01-08 17:02:08 +08:00
Lei Jitang 6c33dca6bb Make .ensure-syscall-test to use build-arg 
.ensure-syscall-test need to build an image, we have
to add http_proxy and https_proxy to make it work.
Inseted of adding http_proxy and https_proxy env to the Dockerfile,
adding a DOCKER_BUILD_ARGS env to pass the build-arg is much more
elegant.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3ff67256132febad4d039845e97db2ad4d55025d
Component: engine
 2016-01-08 15:27:21 +08:00
Phil Estes 6c383a05bb Fix btrfs subvolume snapshot dir perms for user namespaces 
Make sure btrfs mounted subvolumes are owned properly when a remapped
root exists (user namespaces are enabled, for example)

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 72e65e87935e5b82de76a6ef9b8160900f4724b7
Component: engine
 2016-01-07 23:05:28 -05:00
cyli f4511c75b9 Add an integration test for docker being able to push to a repo with delegations. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 1db0c7bb01863f859a193246a0474f9d1b4d6027
Component: engine
 2016-01-07 19:35:45 -08:00
Riyaz Faizullabhoy b741751f8d Notary delegation integration into docker 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c125f50cfce422b19a15e84c5a3940890fb2e23
Component: engine
 2016-01-07 19:35:45 -08:00
Jess Frazelle 083a35097b Merge pull request #19173 from calavera/vendor_engine_api_0_1_2 
Vendor engine-api 0.1.3
Upstream-commit: 611d5e4eebc4c6153e49a319360df8de5bdd2e7c
Component: engine
 2016-01-07 19:19:19 -08:00
Brian Goff 7d383f2b5f On create, copy image data for named volumes. 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b4683327074d193428c724b153e8848ef2068c1d
Component: engine
 2016-01-07 21:57:08 -05:00
David Calavera dbccbefa60 Make sure docker api client implements engine-api client. 
- Use the master interface in the new repo.
- Use new structures for container create, update and network connect.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: e73ab750edc006324d1019b828c8ec9c551b9717
Component: engine
 2016-01-07 21:02:19 -05:00
David Calavera 14985d55be Vendor engine-api 0.1.3. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1feeecf6e58c3690347efed9c0712a698ff426f0
Component: engine
 2016-01-07 21:02:19 -05:00
moxiegirl 6ac9b9caaf Merge pull request #19165 from shishir-a412ed/man_page_fix 
man page fix: remove -e/--exec-drive=native related description
Upstream-commit: 6213cc9d0476ee43bc92e554f4775e33c3c4d38f
Component: engine
 2016-01-07 16:47:07 -08:00
moxiegirl edc9578a83 Merge pull request #18378 from tonistiigi/content-addressability-storage-docs 
Update storage docs for content-addressability
Upstream-commit: b12ef0fe00245ca549be5822d8b26033b59cff7a
Component: engine
 2016-01-07 16:44:29 -08:00
Victoria Bialas 72bafe062f added re-directs for cloud install docs as clean-up for #18282 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 2ffb362f9bbfea5ac72ebe11c5692f129eb8ccd2
Component: engine
 2016-01-07 16:06:46 -08:00
Jess Frazelle f22c8d297c Merge pull request #19145 from vdemeester/vendor-my-precious 
Add a validate-vendor script
Upstream-commit: d76640d78a1a14b1f7f772c100a95cacfd30248c
Component: engine
 2016-01-07 13:53:01 -08:00