dca237fb71
api: client: build: do not fall through if git isn't installed
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 167cc42986c8939c7aacf73570adaf19b8cad0b3
Component: engine
2016-01-19 16:50:14 +01:00
66b0f4bcad
Merge pull request #19432 from jfrazelle/fix-x32
...
add send, recv, and x32 so we can install i386 pkgs on amd64
Upstream-commit: 30e42a27991377e4b278dee089436bc57ee04a4d
Component: engine
2016-01-19 10:20:01 -05:00
b14ba840fe
Merge pull request #19424 from aaronlehmann/revert-multiple-pull-errors
...
Revert reporting of multiple pull errors
Upstream-commit: e8ce350669b0b8096ef2bb365ecad6fbfa966bfb
Component: engine
2016-01-19 09:51:54 -05:00
6e2509f508
Merge pull request #19426 from sanimej/restart
...
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
Upstream-commit: 011ca5f206ed2ffaf8a7871da4ea44c6d03cafd6
Component: engine
2016-01-19 10:28:33 +01:00
b6ea559472
Merge pull request #19437 from HackToday/fixulimit
...
Fix ulimit command form
Upstream-commit: 05e36d254f4310a93df7f5818e85721c3e180d91
Component: engine
2016-01-19 10:26:02 +01:00
53e905757e
Merge pull request #19436 from HackToday/fixhostdev
...
Fix add host device example
Upstream-commit: 25f4f7151221d6a0ebb9185c03cef812ac24825d
Component: engine
2016-01-19 10:25:08 +01:00
8586a19d86
Merge pull request #19433 from HackToday/fixclidoc
...
Fix the privileged example
Upstream-commit: 0f04f3ba9fa81ff10424a7ef93718f8ea1dc7262
Component: engine
2016-01-19 00:37:30 -08:00
0028abf222
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 >
Upstream-commit: 98e5a8efcc390d2b5de18049e3227db7a257c232
Component: engine
2016-01-19 07:44:58 +00:00
3a7ad6768a
Merge pull request #19429 from mavenugo/epv21
...
nil ptr check for endpointsettings when used with older clients
Upstream-commit: 6a1100cafcab1bb0775ffcd13125cbc949e3fb06
Component: engine
2016-01-19 08:43:04 +01:00
debdc9b3c1
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 >
Upstream-commit: 62b525f75dbdb78f8ae7ee7f6b2cac2d262dc4dd
Component: engine
2016-01-19 07:00:58 +00:00
d68b8b9b1f
Fix the privileged example
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 3cc5550003c0b11db572f64c9fc801cde0c7447a
Component: engine
2016-01-19 06:41:49 +00:00
99e8dc11f9
Merge pull request #19431 from WeiZhang555/19422-default-network
...
bugfix: prevent creating network 'default'
Upstream-commit: 42ee908b3faa231322052c27d9ec8ffebc1c40eb
Component: engine
2016-01-19 14:18:20 +08:00
6541731269
add send, recv, and x32 so we can install i386 pkgs on amd64
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 308eff99e8468be4e92951de0ac69b27042a833b
Component: engine
2016-01-18 19:24:01 -08:00
187ffe612a
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 >
Upstream-commit: 31dae442c8a640694209c7451d6e9bf644aa2743
Component: engine
2016-01-19 11:06:36 +08:00
54242d411e
nil ptr check for endpointsettings when used with older clients
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 35dbce109bc1128e4abb2bd726055c2daa4842af
Component: engine
2016-01-18 17:15:59 -08:00
5779f0bfc3
Merge pull request #19420 from clnperez/close-notify-fix
...
Move closeNotify to fix panic with newer golang
Upstream-commit: b6be6451971afc7798c1aa22ff73d681c4e0019b
Component: engine
2016-01-18 20:08:25 -05:00
8a0c8b1a34
Revert reporting of multiple pull errors
...
Revert the portions of #17617 that report all errors when a pull
falls back, and go back to just reporting the last error. This was nice
to have, but causes some UX issues because nonexistent images show
additional "unauthorized" errors.
Keep the part of the PR that handled ENOSPC, as this appears to work
even without tracking multiple errors.
Fixes #19419
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 87338bf0fa97c905d2d707393c95f73aea398cad
Component: engine
2016-01-18 15:49:08 -08:00
d08e97ec27
Merge pull request #19196 from Microsoft/jjh/tp4ci
...
Windows CI: Setup for testing against Windows
Upstream-commit: 637f49b5af6ac61cce6fadc4a3b8264ec14ca29b
Component: engine
2016-01-18 15:22:08 -08:00
acdedd40ae
Merge pull request #19412 from hypriot/skip-tests-on-arm
...
Skip failing tests on ARM to get red/green feedback from Jenkins
Upstream-commit: 416de85359201676f503911459203cd7c07e4eaf
Component: engine
2016-01-18 14:40:46 -08:00
88549196d4
Merge pull request #19414 from anusha-ragunathan/postBuild
...
Make daemonbuilder.Docker leaner.
Upstream-commit: a495c148a5948c372c626c6a4643d361f31374d0
Component: engine
2016-01-18 21:46:49 +01:00
1fa4309fd5
Move closeNotify to fix panic with newer golang
...
This is happening now due to improvements in net/http:
https://github.com/golang/go/commit/99fb19194c03c618c0d8faa87b91ba419ae28ee3
To test, change the go version in the Dockerfile:
-ENV GO_VERSION 1.5.3
+ENV GO_VERSION 1.6beta2
More info here: https://github.com/golang/go/issues/14001
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 2df5dafdaf12296fa2bd92ced62ba80da41af744
Component: engine
2016-01-18 14:24:25 -06:00
980b654418
Merge pull request #19372 from cloudflare/fix-log-copier
...
only close LogDriver after LogCopier is done
Upstream-commit: 3044a08326de43617a3b1328b86ccc89ffe0641d
Component: engine
2016-01-18 14:38:34 -05:00
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
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
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
5ce70c9580
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 >
Upstream-commit: 84e14754e1ef3b089442398a31c5c5813fa9a1b6
Component: engine
2016-01-18 17:47:57 +00:00
bd1120dfd8
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 >
Upstream-commit: 14215ed5a1900a88a3b17dd7cd566def50bfcbc9
Component: engine
2016-01-18 09:16:11 -08:00
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
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
d22cc489e9
Skip failing tests on ARM to get red/green feedback from Jenkins
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 4f339570cbd3cc57f5410c4ca08c7d7e03e6e56f
Component: engine
2016-01-18 17:00:15 +01:00
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
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
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
1df5742548
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
...
- Fixes the issue of Shutdown() not working, resulting in hung
goroutines
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: bccf653082dababc1827be3aa9976e3100037a80
Component: engine
2016-01-17 08:17:13 -08:00
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
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
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
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
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
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
Antonio Murdaca
Tibor Vass
Vincent Demeester
Sebastiaan van Stijn
Kai Qiang Wu(Kennan)
Antonio Murdaca
Lei Jitang
Jessica Frazelle
Zhang Wei
Madhu Venugopal
Brian Goff
Aaron Lehmann
Jess Frazelle
Christy Perez
Daniel Dao
Anusha Ragunathan
Tianon Gravi
Stefan Scherer
Harald Albers
Christopher Jones
Santhosh Manohar
Candid Dauth
Steve Durrheimer
Collin Guarino
Sebastiaan van Stijn
David Calavera
Alexander Morozov