Commit Graph

2913 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
84e80bd254 Fix image filter
This is related image fix for Propose #19153
for volume related change, would use another patch
to fix that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 5ee69eb470316eead3af20725de54d3c47a47a62
Component: engine
2016-01-14 08:17:40 +00:00
e5509a078a Fix #19100 and fix a typo
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3d2539d39d6dd12bf3db13f4df21a997d4f7ee3b
Component: engine
2016-01-14 14:58:54 +08:00
2b7ea75ef2 Forced endpoint cleanup
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b464f1d78cdfa2a4124e083b8f7b0f2353f12de3
Component: engine
2016-01-13 21:28:52 -08:00
b6d75433b3 Merge pull request #19311 from estesp/no-oom-warning-when-cant-even
Only warn on OOMKill disable if the feature is actually requested
Upstream-commit: 9c30492e9e5cf8da5771af87d2b0a83a627ff2b4
Component: engine
2016-01-13 13:43:37 -08:00
3587269c45 Merge pull request #19123 from shishir-a412ed/rootfs_size_configurable
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Upstream-commit: 661d75f39858934c230c59a68d908ef203c34136
Component: engine
2016-01-13 13:22:08 -08:00
2e91a82de6 Merge pull request #19241 from rhvgoyal/fix-device-id-free
Mark device ID free only if device actually got deleted
Upstream-commit: d6e01e3337a6ed1e941cf01840ee91ce55c55db4
Component: engine
2016-01-13 13:07:39 -08:00
5e9b25b836 Only warn on OOMKill disable if the feature is actually requested
Instead of warning the caller who is disabling OOM killer that the
feature isn't available, only warn if they are trying to **enable** OOM
killer and it can't be done.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 5a707d94d605fdf2a35d5a7033d1971b49745352
Component: engine
2016-01-13 11:53:44 -08:00
3bf5cbf342 Merge pull request #19279 from tiborvass/rename-authz-to-authorization
Rename authz to authorization for greater clarity
Upstream-commit: 612cf0f172948c892d642af3213a012fcf292135
Component: engine
2016-01-13 14:30:18 -05:00
460be1e8dd Rename authz to authorization for greater clarity
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5c630ea7c3d5e7a24e1c4b2e15506f326706e9bc
Component: engine
2016-01-13 14:15:37 -05:00
3605a0e9af Merge pull request #19273 from calavera/volume-lazy-init
[Carry 18549] Lazy initialize Volume on container Mount object.
Upstream-commit: 184040bdd55c3930123ad4984dd976181b26cae8
Component: engine
2016-01-13 14:15:17 -05:00
3baefd3b5b daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: e47112d3e812b90b240624711e7a5d2d203d6746
Component: engine
2016-01-13 13:57:31 -05:00
1e6d6c8c64 Merge pull request #19276 from calavera/internal
[Carry 18926] Add network internal mode
Upstream-commit: 0ee64127ae67844918aa961f81e73185c57c21dc
Component: engine
2016-01-13 10:13:21 -08:00
f9405712ff Merge pull request #19254 from aboch/v6b
Account docker0 IPv6 address on daemon start
Upstream-commit: 7ea65da7efe317d9dabc07557c8b2d196d20d815
Component: engine
2016-01-13 09:48:41 -08:00
9c6798de6b Add network interal mode
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: b70954e60a15d09756bd6b00a6fadedc64829477
Component: engine
2016-01-13 11:30:36 -05:00
e92314d4dc Remove duplicated lazy volume initialization.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: aab3596397c7b4fceac9061625898b3d2606597d
Component: engine
2016-01-13 11:22:31 -05:00
296f98f18e Merge pull request #19267 from mavenugo/vin-ln
Vendor libnetwork v0.5.4
Upstream-commit: 46eb4700391e8462756000d584337a763bc563c6
Component: engine
2016-01-13 07:09:58 -05:00
69c1610f93 Merge pull request #19249 from calavera/carry_17414
[Carry 17414] Added additional container information to "docker info".
Upstream-commit: a79f96828f7da2fc762002bf79ab8a9dcf908457
Component: engine
2016-01-13 10:42:22 +01:00
d62b8abe37 Merge pull request #19275 from tonistiigi/delete-image-conflict-bitmask
Use bitmask for conflict checking
Upstream-commit: 40d7ad98a8e9220745a4505b2f6d902c0732f7a5
Component: engine
2016-01-13 10:00:57 +01:00
5530c5d838 Updating to the new ep.Delete API
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8edbd10349afb4ea78919e0037cf895eb95cb5fb
Component: engine
2016-01-12 20:42:37 -08:00
eed3a9a5f1 Do not fail if not support OomKillDisable
Fixes: #19278

The issue seems existed since we add support for OomKillDisable,
OomKillDisable support should not be hard request, we just
discard it if not support and move on.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7b616d4743c94f8be3eb59f8c23ed7a19fb2786d
Component: engine
2016-01-13 09:07:40 +08:00
b2c9225704 Merge pull request #19229 from mavenugo/udlinks
Local alias support
Upstream-commit: 47d87d3b92e349608e080f15035d8485af7254c5
Component: engine
2016-01-12 16:47:32 -08:00
430ab95b60 Use bitmask for conflict checking
Rather than using 2 different functions for different
types of conflicts use a bitmask to specify what
conflicts need to be checked. This allows a better way
to make exceptions.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 883be4893049aa97cb874d239cf6b06325fc74f2
Component: engine
2016-01-12 16:01:56 -08:00
e1237c9947 Merge pull request #19266 from tonistiigi/fix-untag-on-rmi-by-id
Fix rmi by ID untagging image on error
Upstream-commit: 1e1a3c9508f196f17daec3e47298a86949ab66ec
Component: engine
2016-01-12 18:56:25 -05:00
fc7fff6884 Merge pull request #19060 from jfrazelle/daemon-read-seccomp
read seccomp profile locally then pass to daemon
Upstream-commit: 56272c9e9e6816f7515a7a1f58390eccb35780b0
Component: engine
2016-01-12 18:34:59 -05:00
296e59632a Merge pull request #19170 from aaronlehmann/delete-prune-digests
Prune digest references when deleting by tag
Upstream-commit: c0c66c57b2d898e43f7dd74ad9f2f256ea5dfcdf
Component: engine
2016-01-12 15:15:36 -08:00
ae6533484c Lazy initialize Volume on container Mount object
Currently on daemon start volumes are "created" which involves invoking
a volume driver if needed.  If this process fails the mount is left in a
bad state in which there is no source or Volume set.  This now becomes
an unrecoverable state in which that container can not be started.  The
only way to fix is to restart the daemon and hopefully you don't get
another error on startup.

This change moves "createVolume" to be done at container start.  If the
start fails it leaves it in the state in which you can try another
start.  If the second start can contact the volume driver everything
will recover fine.

Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 2aa673aed7cd10497d578a14a9550c75789e0a43
Component: engine
2016-01-12 17:19:59 -05:00
f00ac953d1 Fix rmi by ID untagging image on error
Do not untag image if it would later get a hard conflict because of running containers.

Fixes #18873

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 38a45eed8850a15d2f737ce7455f29c5ae53ab49
Component: engine
2016-01-12 13:45:40 -08:00
6c7b14647b Support --link for user-defined networks
This brings in the container-local alias functionality for containers
connected to u ser-defined networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: e221b8a3d64c13178e156fc3ece5e9894dac1603
Component: engine
2016-01-12 13:38:48 -08:00
fb652937c3 read seccomp profile locally then pass to daemon
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 062d0b3921316bc348c7930ce6599e1f8f297090
Component: engine
2016-01-12 13:12:29 -08:00
3d01d0155a Merge pull request #19243 from calavera/engine_api_0_2
Vendor engine-api 0.2
Upstream-commit: c1582f20cc6ff1abe576e5aabb60c73309055556
Component: engine
2016-01-12 13:11:39 -08:00