Vincent Demeester
05e36d254f
Merge pull request #19437 from HackToday/fixulimit
...
Fix ulimit command form
2016-01-19 10:26:02 +01:00
Vincent Demeester
25f4f71512
Merge pull request #19436 from HackToday/fixhostdev
...
Fix add host device example
2016-01-19 10:25:08 +01:00
Sebastiaan van Stijn
0f04f3ba9f
Merge pull request #19433 from HackToday/fixclidoc
...
Fix the privileged example
2016-01-19 00:37:30 -08:00
Kai Qiang Wu(Kennan)
98e5a8efcc
Fix ulimit command form
...
The ulimit is builtin, so we need shell form to execute it.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-19 07:44:58 +00:00
Antonio Murdaca
6a1100cafc
Merge pull request #19429 from mavenugo/epv21
...
nil ptr check for endpointsettings when used with older clients
2016-01-19 08:43:04 +01:00
Kai Qiang Wu(Kennan)
62b525f75d
Fix add host device example
...
The example is not right in parameter, and also
one command is same as first one, it should be typo
before, we should use 'rw' as example for that.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-19 07:00:58 +00:00
Kai Qiang Wu(Kennan)
3cc5550003
Fix the privileged example
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-19 06:41:49 +00:00
Lei Jitang
42ee908b3f
Merge pull request #19431 from WeiZhang555/19422-default-network
...
bugfix: prevent creating network 'default'
2016-01-19 14:18:20 +08:00
Zhang Wei
31dae442c8
bugfix: prevent creating network 'default'
...
Default is predefined network and is reserved, so we should stop user
from creating network with name `default`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-19 11:06:36 +08:00
Madhu Venugopal
35dbce109b
nil ptr check for endpointsettings when used with older clients
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-18 17:15:59 -08:00
Brian Goff
b6be645197
Merge pull request #19420 from clnperez/close-notify-fix
...
Move closeNotify to fix panic with newer golang
2016-01-18 20:08:25 -05:00
Jess Frazelle
637f49b5af
Merge pull request #19196 from Microsoft/jjh/tp4ci
...
Windows CI: Setup for testing against Windows
2016-01-18 15:22:08 -08:00
Jess Frazelle
416de85359
Merge pull request #19412 from hypriot/skip-tests-on-arm
...
Skip failing tests on ARM to get red/green feedback from Jenkins
2016-01-18 14:40:46 -08:00
Antonio Murdaca
a495c148a5
Merge pull request #19414 from anusha-ragunathan/postBuild
...
Make daemonbuilder.Docker leaner.
2016-01-18 21:46:49 +01:00
Christy Perez
2df5dafdaf
Move closeNotify to fix panic with newer golang
...
This is happening now due to improvements in net/http:
99fb19194chttps://github.com/golang/go/issues/14001
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2016-01-18 14:24:25 -06:00
Brian Goff
3044a08326
Merge pull request #19372 from cloudflare/fix-log-copier
...
only close LogDriver after LogCopier is done
2016-01-18 14:38:34 -05:00
Brian Goff
2cd74f9932
Merge pull request #19391 from cdauth/systemd_tasks_max
...
Set TasksMax in addition to LimitNPROC in systemd service files
2016-01-18 13:33:07 -05:00
Jess Frazelle
afa9b75c7c
Merge pull request #19310 from tophj-ibm/add-registry-remove-notary-on-power
...
update registry and remove notary on ppc64le
2016-01-18 09:51:02 -08:00
Jess Frazelle
a7652ad276
Merge pull request #19410 from tophj-ibm/add-gccgo-target-to-makefile
...
Add gccgo target to Makefile
2016-01-18 09:50:44 -08:00
Daniel Dao
84e14754e1
only close LogDriver after LogCopier is done
...
this prevents the copier from sending messages in the buffer to the closed
driver. If the copied took longer than the timeout to drain the buffer, this
aborts the copier read loop and return back so we can cleanup resources
properly.
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2016-01-18 17:47:57 +00:00
Anusha Ragunathan
14215ed5a1
Make daemonbuilder.Docker leaner.
...
Currently builder.Backend is implemented by daemonbuilder.Docker{} for
the daemon. This registration happens in the API/server code. However,
this is too implementation specific. Ideally we should be able to specify
that docker daemon (or any other) is implementing the Backend and abstract
the implementation details. So we should remove package daemonbuilder
dependency in build_routes.go
With this change, daemonbuilder.Docker is nothing more than the daemon.
A follow on change will remove the daemonbuilder package and move relevant
methods under daemon, so that API only knows about the backend.
Also cleanup code in api/client/build.go. docker cli always performs build
context tar download for remoteURLs and sends an empty remoteContext. So
remove relevant dead code.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-01-18 09:16:11 -08:00
Tianon Gravi
8a4b4f5950
Merge pull request #19409 from albers/completion-network-links
...
bash completion for container linking and aliasing
2016-01-18 08:36:33 -08:00
Tianon Gravi
f5299b64aa
Merge pull request #19411 from albers/completion-network-create--internal
...
Update bash completion for `docker network create`
2016-01-18 08:34:59 -08:00
Stefan Scherer
4f339570cb
Skip failing tests on ARM to get red/green feedback from Jenkins
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-18 17:00:15 +01:00
Harald Albers
6ae4ffb6e5
bash completion for docker network create --internal, --ipam-opt
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-18 07:50:26 -08:00
Christopher Jones
06f48a26f8
Add gccgo target to Makefile
...
Adds a gccgo target to the Makefile
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-01-18 10:40:45 -05:00
Harald Albers
67fe772ca6
bash completion for container linking and aliasing
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-18 07:11:19 -08:00
Candid Dauth
105778343a
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>
2016-01-16 18:45:41 +01:00
Brian Goff
82401a4b13
Merge pull request #19386 from sdurrheimer/zsh-completion-network-create-internal
...
Add zsh completion for 'docker network create --internal'
2016-01-16 08:04:05 -05:00
Brian Goff
a2b72dc4ba
Merge pull request #19387 from sdurrheimer/zsh-completion-network-connect-disconnect-stopped-containers
...
Modify zsh completion for connecting/disconnecting non-running contai…
2016-01-16 07:57:13 -05:00
Steve Durrheimer
0a9508e821
Modify zsh completion for connecting/disconnecting non-running containers to networks
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-16 12:59:20 +01:00
Steve Durrheimer
581a55d54c
Add zsh completion for 'docker network create --internal'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-16 12:53:50 +01:00
Sebastiaan van Stijn
f1c6cd57fa
Merge pull request #19320 from cilium-team/fixing-inspect-api-container-volume-driver
...
Fixing TestInspectApiContainerVolumeDriver
2016-01-16 01:04:32 -08:00
Sebastiaan van Stijn
785493226b
Merge pull request #19379 from thaJeztah/update-windows-dockerfile
...
Switch Windows Dockerfile to golang 1.5.3
2016-01-16 01:00:19 -08:00
Sebastiaan van Stijn
d232ed4cea
Merge pull request #19382 from Collinux/master
...
Fixed typo in experimental/plugins_graphdriver.md
2016-01-15 18:51:29 -08:00
Collin Guarino
aabe39be01
Fixed typo in experimental/plugins_graphdriver.md
...
Signed-off-by: Collin Guarino <collin.guarino@gmail.com>
2016-01-15 21:33:36 -05:00
Jess Frazelle
b69243e951
Merge pull request #19169 from Djelibeybi/fix-ol6-build
...
Restoring the RPM build process for Oracle Linux 6
2016-01-15 16:56:11 -08:00
Sebastiaan van Stijn
e281f640c6
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>
2016-01-15 15:52:53 -08:00
Jess Frazelle
4e9ee2a239
Merge pull request #19373 from Microsoft/jjh/makefile
...
Windows: Update makefile
2016-01-15 15:42:47 -08:00
Jess Frazelle
b70d615222
Merge pull request #18348 from hypriot/add-dockerfile-for-windows
...
Add initial support building Windows docker in docker
2016-01-15 15:42:11 -08:00
David Calavera
15e5cd14d6
Merge pull request #19255 from hqhq/hq_build_args_makefile
...
Add DOCKER_BUILD_ARGS support for make build
2016-01-15 14:21:37 -08:00
Alexander Morozov
790e648c06
Merge pull request #19340 from Microsoft/jjh/rsrcfix
...
Windows: Remove linkmode internal hack
2016-01-15 14:10:56 -08:00
Vincent Demeester
c476b2e3b5
Merge pull request #19041 from Akasurde/11556
...
Updated documentation related to apt-cacher-ng
2016-01-15 22:44:46 +01:00
Alexander Morozov
402ba93f68
Merge pull request #19374 from Microsoft/jjh/termdeadcode
...
Windows: Remove dead/unused code
2016-01-15 13:30:23 -08:00
Phil Estes
dd104eb91d
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
2016-01-15 16:06:14 -05:00
John Howard
76ebd3dd17
Windows: Remove dead code
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-15 12:48:40 -08:00
Phil Estes
bc13e4a99e
Merge pull request #19369 from cpuguy83/19362_fix_exec_panic
...
Fix panic on starting exec more than once
2016-01-15 15:17:52 -05:00
John Howard
08fe0a18f8
Windows: Update makefile
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-15 11:45:13 -08:00
David Calavera
b63b43dc4c
Merge pull request #19219 from runcom/add-log
...
integration-cli: log error when starting registry
2016-01-15 09:44:47 -08:00
Brian Goff
1a60a805bf
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>
2016-01-15 11:57:23 -05:00
