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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c8a4568d47
Merge pull request #19109 from BrianBland/crossRepositoryPush
...
Cross repository push
Upstream-commit: 94b2d5669016be0063abbcb6917026bdfb52478c
Component: engine
2016-01-14 18:50:53 -05:00
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
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
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
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
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
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
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
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
2365ad5675
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
...
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 9b2aab3fc85ab1d8cf7479b153e54d5dcceb7886
Component: engine
2016-01-14 13:51:30 -08:00
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
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
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
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
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
f048e88551
Windows: Remove linkmode internal hack
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6ca5a2c476f548b55d68daa4264b4ef9e6c2696d
Component: engine
2016-01-14 13:09:28 -08:00
