toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,401 Commits 3 Branches 295 Tags
4562635fa924a617256be860579b71a238babbd7
Commit Graph
21401 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessica Frazelle 4562635fa9 disable install of docker-engine for 1.10, try to get ready for 1.11 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c4bc9657b9e52f12b37aa36da15c1a2eb86519a3
Component: engine
 2016-01-18 13:38:29 -08:00
Brian Goff e1f805562a Merge pull request #19391 from cdauth/systemd_tasks_max 
Set TasksMax in addition to LimitNPROC in systemd service files
Upstream-commit: 2cd74f99322403ae6de5ee75c05343b3b35a2645
Component: engine
 2016-01-18 13:33:07 -05:00
Jess Frazelle f2b1bc3c40 Merge pull request #19310 from tophj-ibm/add-registry-remove-notary-on-power 
update registry and remove notary on ppc64le
Upstream-commit: afa9b75c7c144586b628afec8a2fece70e9b9769
Component: engine
 2016-01-18 09:51:02 -08:00
Jess Frazelle 385165a58c Merge pull request #19410 from tophj-ibm/add-gccgo-target-to-makefile 
Add gccgo target to Makefile
Upstream-commit: a7652ad2764f56d5a960f87e110f9fb34641a800
Component: engine
 2016-01-18 09:50:44 -08:00
Tianon Gravi a84ec93f11 Merge pull request #19409 from albers/completion-network-links 
bash completion for container linking and aliasing
Upstream-commit: 8a4b4f5950dc85dc987dd7363495cbc38bf77972
Component: engine
 2016-01-18 08:36:33 -08:00
Tianon Gravi 8e468d6f8f Merge pull request #19411 from albers/completion-network-create--internal 
Update bash completion for `docker network create`
Upstream-commit: f5299b64aaed12e275d67c0d2022717a8d84ca92
Component: engine
 2016-01-18 08:34:59 -08:00
Harald Albers 4a62754a9e bash completion for docker network create --internal, --ipam-opt 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6ae4ffb6e5b82ebef504c5dc547ec97d01e0856f
Component: engine
 2016-01-18 07:50:26 -08:00
Christopher Jones e9781f943e Add gccgo target to Makefile 
Adds a gccgo target to the Makefile

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 06f48a26f880f9bdfd853cbe94e8a8e9cecfee14
Component: engine
 2016-01-18 10:40:45 -05:00
Harald Albers e2f01fecd9 bash completion for container linking and aliasing 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 67fe772ca627adf1c0e5937de72e30481068820f
Component: engine
 2016-01-18 07:11:19 -08:00
Candid Dauth b8f7499a3b Set TasksMax in addition to LimitNPROC in systemd service files 
systemd sets an additional limit on processes and threads that defaults to 512 when run under Linux >= 4.3.
See more information here: http://unix.stackexchange.com/a/255603/59955

Signed-off-by: Candid Dauth <cdauth@cdauth.eu>
Upstream-commit: 105778343a2e5d510fae1cbdb1b7ab6879e5a028
Component: engine
 2016-01-16 18:45:41 +01:00
Brian Goff a42acfafda Merge pull request #19386 from sdurrheimer/zsh-completion-network-create-internal 
Add zsh completion for 'docker network create --internal'
Upstream-commit: 82401a4b13c0581908d46dbc3e7b475c7de48334
Component: engine
 2016-01-16 08:04:05 -05:00
Brian Goff 5401517598 Merge pull request #19387 from sdurrheimer/zsh-completion-network-connect-disconnect-stopped-containers 
Modify zsh completion for connecting/disconnecting non-running contai…
Upstream-commit: a2b72dc4ba1983224bc06acfa69b74b21801f0af
Component: engine
 2016-01-16 07:57:13 -05:00
Steve Durrheimer 58070250bb Modify zsh completion for connecting/disconnecting non-running containers to networks 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0a9508e821384b96979d1dd91acdb67ed83f8e7f
Component: engine
 2016-01-16 12:59:20 +01:00
Steve Durrheimer 7f98a9ef4d Add zsh completion for 'docker network create --internal' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 581a55d54c135b2e92cfb3d16939bea33a242723
Component: engine
 2016-01-16 12:53:50 +01:00
Sebastiaan van Stijn 5afee20d48 Merge pull request #19320 from cilium-team/fixing-inspect-api-container-volume-driver 
Fixing TestInspectApiContainerVolumeDriver
Upstream-commit: f1c6cd57fab751464c174a84b41b511cb400ee55
Component: engine
 2016-01-16 01:04:32 -08:00
Sebastiaan van Stijn d7b38ae326 Merge pull request #19379 from thaJeztah/update-windows-dockerfile 
Switch Windows Dockerfile to golang 1.5.3
Upstream-commit: 785493226b50ee844f7026f2f846ebf94ed5a9dc
Component: engine
 2016-01-16 01:00:19 -08:00
Sebastiaan van Stijn 3d210ea531 Merge pull request #19382 from Collinux/master 
Fixed typo in experimental/plugins_graphdriver.md
Upstream-commit: d232ed4cea83a9f908b37012eea8627610a3d1ef
Component: engine
 2016-01-15 18:51:29 -08:00
Collin Guarino 5a0e6de95d Fixed typo in experimental/plugins_graphdriver.md 
Signed-off-by: Collin Guarino <collin.guarino@gmail.com>
Upstream-commit: aabe39be01c70318af57159b235a4ddd8781051b
Component: engine
 2016-01-15 21:33:36 -05:00
Jess Frazelle d8a8275332 Merge pull request #19169 from Djelibeybi/fix-ol6-build 
Restoring the RPM build process for Oracle Linux 6
Upstream-commit: b69243e951a9845c3bd3e718452865c2753b7a0c
Component: engine
 2016-01-15 16:56:11 -08:00
Sebastiaan van Stijn 63fd2cf9aa Switch Windows Dockerfile to golang 1.5.3 
Also renamed the env-variable to match what
we use in other locations (for easier finding)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e281f640c69a11d7c211e167691cbc563ecdeac7
Component: engine
 2016-01-15 15:52:53 -08:00
Jess Frazelle ff7dd95471 Merge pull request #19373 from Microsoft/jjh/makefile 
Windows: Update makefile
Upstream-commit: 4e9ee2a239747fb19e26818cf8ed95d8bbfc3e27
Component: engine
 2016-01-15 15:42:47 -08:00
Jess Frazelle 9ad6fc408d Merge pull request #18348 from hypriot/add-dockerfile-for-windows 
Add initial support building Windows docker in docker
Upstream-commit: b70d6152225ca341a1432f09320825bf05898dac
Component: engine
 2016-01-15 15:42:11 -08:00
David Calavera e51e359b6f Merge pull request #19255 from hqhq/hq_build_args_makefile 
Add DOCKER_BUILD_ARGS support for make build
Upstream-commit: 15e5cd14d67d28f3ad843bc792010b72a8e0635d
Component: engine
 2016-01-15 14:21:37 -08:00
Alexander Morozov d3d0a35112 Merge pull request #19340 from Microsoft/jjh/rsrcfix 
Windows: Remove linkmode internal hack
Upstream-commit: 790e648c0613e435be56727e1ebbdc0ccf8aeb56
Component: engine
 2016-01-15 14:10:56 -08:00
Vincent Demeester c5ac81d906 Merge pull request #19041 from Akasurde/11556 
Updated documentation related to apt-cacher-ng
Upstream-commit: c476b2e3b5dd480a2b886ec4c20950c0e22fb3e7
Component: engine
 2016-01-15 22:44:46 +01:00
Alexander Morozov f64326633e Merge pull request #19374 from Microsoft/jjh/termdeadcode 
Windows: Remove dead/unused code
Upstream-commit: 402ba93f68fd969536bfd541663c57d44cc4e8dd
Component: engine
 2016-01-15 13:30:23 -08:00
Phil Estes 170652aa2c Merge pull request #19345 from tianon/fast-syscall-compile 
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
Upstream-commit: dd104eb91d6e2eeb92467363d75c762ec303ac84
Component: engine
 2016-01-15 16:06:14 -05:00
John Howard ef690537a4 Windows: Remove dead code 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 76ebd3dd179444b4a464db6e970030dd695cf5a1
Component: engine
 2016-01-15 12:48:40 -08:00
Phil Estes 1386c79d5e Merge pull request #19369 from cpuguy83/19362_fix_exec_panic 
Fix panic on starting exec more than once
Upstream-commit: bc13e4a99e92c1d259d6108bee19ddebc724106d
Component: engine
 2016-01-15 15:17:52 -05:00
John Howard 892561929a Windows: Update makefile 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 08fe0a18f8fbb8e6aaa3760e4e6ffd6032731ca2
Component: engine
 2016-01-15 11:45:13 -08:00
David Calavera ce0b3177f6 Merge pull request #19219 from runcom/add-log 
integration-cli: log error when starting registry
Upstream-commit: b63b43dc4c4777a25b722da96a9f1c6e71d98e2a
Component: engine
 2016-01-15 09:44:47 -08:00
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
Tibor Vass 4fc6a4543d Merge pull request #19365 from tiborvass/bump_apiversion_to_v1.23 
Bump API Version to v1.23
Upstream-commit: 012a3b6e74d753e1b0560d8f9b085b0fa0a80c0f
Component: engine
 2016-01-15 10:48:15 -05:00
Tibor Vass cd32dc3773 Bump API Version to v1.23 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: a0fab35fe80f201fc40477a32a992f6cd931cf44
Component: engine
 2016-01-15 10:44:02 -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
Stefan Scherer ae1543bb11 Add initial support building Windows docker in docker 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 6c88b8efead658167b9349a2ed8d04a432f26006
Component: engine
 2016-01-15 00:20:50 +01: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