toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,358 Commits 3 Branches 295 Tags
addf165927eec89005c7a6fce91c8436809943a9
Commit Graph
21358 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff addf165927 Fix panic on starting exec more than once 
Issue was caused when exec is tarted, exits, then stated again.
In this case, `Close` is called twice, which closes a channel twice.

Changes execConfig.ExitCode to a pointer so we can test if the it has
been set or not.
This allows us to return early when the exec has already been run.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1a60a805bfabee729dbc833515cd0be439adb95b
Component: engine
 2016-01-15 11:57:23 -05:00
Vincent Demeester 89c24617af Merge pull request #19234 from jdoliner/patch-1 
Remove Pachyderm storage driver.
Upstream-commit: 9b630197111fabedd3e382eb94812ecba0435be7
Component: engine
 2016-01-15 12:48:42 +01:00
Joe Doliner ec621875ef Remove Pachyderm storage driver. 
Signed-off-by: Joe Doliner <jdoliner@gmail.com>
Upstream-commit: 5063efb8d84aac9f7e11cbfe41ac3dbd264cb1b9
Component: engine
 2016-01-15 02:06:20 -08:00
Jess Frazelle 6e02d0f3a0 Merge pull request #19355 from riyazdf/notary-revendor 
notary revendor into docker
Upstream-commit: 4c89b1f72c1259858e243ddbfb00d74dbafeff8a
Component: engine
 2016-01-15 01:02:35 -08:00
Antonio Murdaca bb623d7d04 Merge pull request #19356 from sanimej/restart 
Vendoring libnetwork v0.5.6
Upstream-commit: bca9415b526d413778fb271be4f5c0208915a027
Component: engine
 2016-01-15 09:32:53 +01:00
Vincent Demeester 5ed62ef86c Merge pull request #18928 from wenchma/18626-add_subnets_info 
Add Subnets info for user-defined network
Upstream-commit: 8ce8813cdca852b3f0c6ed69fa896023e6fd5bc2
Component: engine
 2016-01-15 09:07:18 +01:00
Riyaz Faizullabhoy 9952183b81 revendor notary and wrap friendlier error messages 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: dd7436c832a5dd777d0276c3e3b1819062b86ebc
Component: engine
 2016-01-14 20:35:59 -08:00
Sebastiaan van Stijn b63f564a27 Merge pull request #19353 from calavera/coolljt0725_is_a_maintainer 
Add Lei Jitang to MAINTAINERS.
Upstream-commit: c56ed85f3d79054391fa7a485ad476571569aa97
Component: engine
 2016-01-14 19:37:33 -08:00
David Calavera 7a30ee2eea Add Lei Jitang to MAINTAINERS. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 8fc36b7f6bc5a0aaa0fbabfd4a828887d5c162eb
Component: engine
 2016-01-14 21:59:26 -05:00
Wen Cheng Ma 819b85bb3a Add Subnets info for user-defined network 
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 5cc672b0061f3df41073cb7b4ff962998a13a09c
Component: engine
 2016-01-15 10:03:29 +08:00
Sebastiaan van Stijn b7e519041b Merge pull request #19122 from ajneu/master 
documentation: debian/ubuntu need apt-transport-https ca-certificates
Upstream-commit: 954613fb248ee31ed1a919f72153eb43268f2c30
Component: engine
 2016-01-14 16:53:08 -08:00
Arnaud Porterie 6f200e8423 Merge pull request #19308 from estesp/better-warning-msg 
Better warning message on OOM kill disable without mem limit
Upstream-commit: 6add477c9185f09e20c3ca94dd42fff5d6084461
Component: engine
 2016-01-14 16:49:38 -08:00
Sebastiaan van Stijn 25aab1428e Merge pull request #18587 from calavera/daemon_configuration_file 
Allow to set daemon and server configurations in a file.
Upstream-commit: e44364eae90784b423eee8b2969bda9cd2429746
Component: engine
 2016-01-14 16:44:58 -08:00
Tibor Vass c8a4568d47 Merge pull request #19109 from BrianBland/crossRepositoryPush 
Cross repository push
Upstream-commit: 94b2d5669016be0063abbcb6917026bdfb52478c
Component: engine
 2016-01-14 18:50:53 -05:00
Jess Frazelle 464329d0d1 Merge pull request #19332 from hypriot/update-arm-registry-notary 
Update Dockerfile.armhf to sync changes for registry and notary
Upstream-commit: 4bdb440cca37b63a57826ae32ba8636b78e3dd40
Component: engine
 2016-01-14 14:54:12 -08:00
Sebastiaan van Stijn 95dbab54f7 Merge pull request #18452 from moxiegirl/carrry-doc-17989 
Update security docs for seccomp/apparmor
Upstream-commit: 9539c0a4022857f7d317894e24a0694f4b62bbaf
Component: engine
 2016-01-14 14:42:37 -08:00
Arnaud Porterie e168bb6f35 Merge pull request #19346 from albers/completion-detach-keys 
Completion and docs update for --detach-keys
Upstream-commit: 33a06a7f05ce660ab307f5b392a2abad96748566
Component: engine
 2016-01-14 14:40:44 -08:00
Brian Bland bcd131a7aa Changes cross-repository blob mounting to a blob Create option 
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata

Signed-off-by: Brian Bland <brian.bland@docker.com>
Upstream-commit: 63099477189ea14f3122f6aa37fa7c60d33562c7
Component: engine
 2016-01-14 14:26:03 -08:00
Harald Albers 198f38f301 Document that detach keys are a list of key bindings 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3bf821054e1d7681ae76ec3dbba8ea81f4dc5adf
Component: engine
 2016-01-14 13:58:41 -08:00
Jessica Frazelle 90c89012d1 WIP: Update security docs for seccomp/apparmor 
Signed-off-by: Mary Anthony <mary@docker.com>

Updaing and slight re-arrangement of security information

Signed-off-by: Mary Anthony <mary@docker.com>

Updating security files

Signed-off-by: Mary Anthony <mary@docker.com>

Updating links to the security documentation

Signed-off-by: Mary Anthony <mary@docker.com>

removing some extra spaces

Signed-off-by: Mary Anthony <mary@docker.com>

Correcting spelling

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 61553fc2f538a7fe8f83e6b41a93722b5c61d374
Component: engine
 2016-01-14 13:58:37 -08:00
Tibor Vass 4a4ab3133f Merge pull request #19339 from cpuguy83/19335_revert_18736 
Revert "Break big lock into some tiny locks"
Upstream-commit: 9365b301a821a95e36589c990a36ea4c619b9ba1
Component: engine
 2016-01-14 16:53:39 -05:00
Brian Goff 035da2c40e Merge pull request #19325 from mingqing/fix-pid-convert-error 
fix pidfile, pid is num use '/proc + string(pid)' can't found it
Upstream-commit: 3b6a989d815cc1acc23a0d7b775abda337b464d6
Component: engine
 2016-01-14 16:49:20 -05:00
Harald Albers f10d08e793 bash completion for --detach-keys 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b24ded193f7175e7f63e2bb8432b430a6665bfdf
Component: engine
 2016-01-14 13:47:20 -08:00
David Calavera 1a8f320266 Allow to set daemon and server configurations in a file. 
Read configuration after flags making this the priority:

1- Apply configuration from file.
2- Apply configuration from flags.

Reload configuration when a signal is received, USR2 in Linux:

- Reload router if the debug configuration changes.
- Reload daemon labels.
- Reload cluster discovery.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 677a6b3506107468ed8c00331991afd9176fa0b9
Component: engine
 2016-01-14 16:44:37 -05:00
Tibor Vass 57bedb0b2d Merge pull request #17316 from rmb938/ipam_conf_options 
Add IPAM Config Options to match libnetwork
Upstream-commit: e35f5a481ac5c982c4f97be5dc41206e21e19007
Component: engine
 2016-01-14 16:30:03 -05:00
Arnaud Porterie 390716081e Merge pull request #19343 from Microsoft/jjh/dockerfilenote 
Add note in dockerfile about go version
Upstream-commit: 0f2ba97a787950838f0f762ed4d9cc8403862f24
Component: engine
 2016-01-14 13:11:03 -08:00
David Calavera 6450022b83 Merge pull request #19342 from Microsoft/jjh/fix19316 
Windows: Fix test regression from 19155
Upstream-commit: d299bbfcc62e510c7a485672aacc245bcbd2198a
Component: engine
 2016-01-14 13:05:47 -08:00
David Calavera bc77bba632 Merge pull request #19338 from aboch/vnd 
Vendoring libnetwork v0.5.5
Upstream-commit: db2b5e647c8cd5a2dd0d853785f8c3a2fc9cbbfc
Component: engine
 2016-01-14 13:02:20 -08:00
Jess Frazelle b938aebf84 Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog 
Remove the changelog auto-generation
Upstream-commit: 7a442651292a32316d5ba0bf018f9cf8444e7717
Component: engine
 2016-01-14 12:47:32 -08:00
John Howard 8735a147d2 Add note in dockerfile about go version 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6c1382e151676ada408d89d6e197dbcf47dc4ebd
Component: engine
 2016-01-14 12:20:19 -08:00
John Howard a939b26632 Windows: Fix test regression from 19155 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d3392a3bdecca4b79e1ea942595f05c03fcd5995
Component: engine
 2016-01-14 12:00:27 -08:00
Ryan Belgrave f8714c52f0 Add IPAM Config Options to match libnetwork 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
Upstream-commit: 662cac08ef83ee105addb4d29f6e46188468306f
Component: engine
 2016-01-14 14:32:25 -05:00
Arnaud Porterie 59828f1612 Merge pull request #19333 from wzyboy/patch-1 
Update CHANGELOG.md
Upstream-commit: 3ce3fb7417a09662fefdd4cee06d9b9009af1b35
Component: engine
 2016-01-14 11:21:32 -08:00
Madhu Venugopal ddffdc7130 IT for restart-policy and DNS based SD in user-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 7481961009e023a624d053e50f70ff3eb666dd19
Component: engine
 2016-01-14 11:03:26 -08:00
Brian Goff f2aa94a27b Merge pull request #19326 from HackToday/19153-filter-rethink 
Fix image filter
Upstream-commit: 7cd6210a88006da21529aeccadea79c9ce720abb
Component: engine
 2016-01-14 13:59:14 -05:00
David Calavera 082c746378 Merge pull request #19242 from mavenugo/nsalias 
Network scoped alias support
Upstream-commit: 73a5393bf3530815a608725fe2546121ccadbfe4
Component: engine
 2016-01-14 10:58:51 -08:00
Santhosh Manohar a534cbd465 Vendoring libnetwork v0.5.6 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 5347f7cd947df3e29d777274c9325c9461a1c051
Component: engine
 2016-01-14 10:48:48 -08:00
Brian Goff 49a1d12f12 Revert "Break big lock into some tiny locks" 
This reverts commit 1326f0cba5f933674e23769de1385d3b0841e758.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f093e1273d7d030a24045d97a78fec8637f46bf8
Component: engine
 2016-01-14 13:38:09 -05:00
Alessandro Boch b8b2e1e984 Vendoring libnetwork v0.5.5 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 4e4ba9dd3a1d488cf9d808f35904ce59911a55de
Component: engine
 2016-01-14 10:34:00 -08:00
David Calavera ded6ab4c78 Merge pull request #19323 from wenchma/19089-add_network_id 
Add network ID to container inspect
Upstream-commit: 812d95cdfb78f4063b967b23911ed3ef152ad533
Component: engine
 2016-01-14 09:58:24 -08:00
Tibor Vass af7fec7cd7 Merge pull request #19226 from coolljt0725/remove_dup_check 
Remove duplication checking for the existence of endpoint to speed up container starting
Upstream-commit: f292e90b8dcca4fabf9d6aa6d889e9fae0eca6ba
Component: engine
 2016-01-14 12:24:11 -05:00
David Calavera 980beea08a Merge pull request #19155 from coolljt0725/create_cwd_on_create 
Create the working directory on container creation
Upstream-commit: a225e39667d7ddd2345326bc5cd3b1ce15fd0bad
Component: engine
 2016-01-14 09:13:44 -08:00
David Calavera caec173c21 Add an unsafe memory discovery store for testing. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 22a81a2c588a7505fd5f900e2093c44cd51ae142
Component: engine
 2016-01-14 11:58:38 -05:00
David Calavera d9690fd0d0 Vendor merge structure tool. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1666707cf895e9de63aedaf744ae4923c41f73d2
Component: engine
 2016-01-14 11:58:38 -05:00
Madhu Venugopal 8eb1087397 Network scoped alias support 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dda513ef651b42fcb9625e651f664554161c0a6a
Component: engine
 2016-01-14 08:44:41 -08:00
Tibor Vass cfd7c2432a Merge pull request #19291 from coolljt0725/fix_19100 
Fix #19100 and fix a typo
Upstream-commit: 349d9700bd5e3bbf86ea2b7c0097b5f897e2fbc1
Component: engine
 2016-01-14 11:40:29 -05:00
Wen Cheng Ma 806650627f Add network ID to container inspect 
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 9f676ade0aef66bb66a26171d6bfb27f105fa1df
Component: engine
 2016-01-14 22:33:41 +08:00
Tibor Vass 8bab3a37a3 Merge pull request #19312 from cpuguy83/19177_fix_debug_req_dump_size 
Don't dump request body when too large
Upstream-commit: 59231ea6d8bdff3d32140d7ab28aeb98fb93ebff
Component: engine
 2016-01-14 09:06:02 -05:00
Vincent Demeester da272e0828 Merge pull request #19317 from mavenugo/epforce 
Forced endpoint cleanup
Upstream-commit: 851c94db1bafac593cf193dd9dde26cd3d9e7f23
Component: engine
 2016-01-14 14:21:30 +01:00
Zhuoyun Wei 0f98f8e081 Update CHANGELOG.md 
Fix "smart" dashes.

Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org>
Upstream-commit: 11801100be9e6f5c67e13855bac984688d8f7c76
Component: engine
 2016-01-14 20:24:24 +08:00