Commit Graph

17375 Commits

Author SHA1 Message Date
c12ca2de3a Allocate resources for server API before daemon creation
It prevents occupying of those resources (ports, unix-sockets) by
containers.
Also fixed false-positive test for that case.

Fix #15912

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 5eda566f937dddef9d4267dd8b8b1d8c3e47b290
Component: engine
2015-10-05 09:32:08 -07:00
3b057aaeb2 Merge pull request #16250 from cpuguy83/15487_exec_error_codes
Make exec start return proper error codes
Upstream-commit: 5a43beda91efd9a53c798082abbc5b287167aa0c
Component: engine
2015-10-02 12:55:17 -07:00
56b56acf38 Merge pull request #16708 from jfrazelle/fix-shm-mqueue-when-mounted-from-host
do not mount /dev/shm or /dev/mqueue if we are mounting from the host
Upstream-commit: 662f55d11d2f278daf5b9be215608540af35be4d
Component: engine
2015-10-02 15:13:59 -04:00
d911d85df7 Merge pull request #16490 from Microsoft/10662-mtimefix
Fixed file modified time not changing on windows
Upstream-commit: 134fefbaa2b63e337a5ef247111bb5a2733809be
Component: engine
2015-10-02 12:06:03 -07:00
a9fcaeb043 Make exec start return proper error codes
Exec start was sending HTTP 500 for every error.

Fixed an error where pausing a container and then calling exec start
caused the daemon to freeze.

Updated API docs which incorrectly showed that a successful exec start
was an HTTP 201, in reality it is HTTP 200.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2d43d93410c29cec87deb9cd940c3b2a8af5fbbb
Component: engine
2015-10-02 14:40:22 -04:00
f14e695085 Merge pull request #16159 from runcom/validate-cpuset-cpus
Validate --cpuset-cpus, --cpuset-mems
Upstream-commit: 698e14902a06af0613b697d88935ae0200659bff
Component: engine
2015-10-02 11:30:46 -07:00
f12a07a163 Merge pull request #16367 from Morgy93/names-generator
Added some adjectives and names
Upstream-commit: bbac09a0976b946724d5fc0ac17eddf9ee8e9a61
Component: engine
2015-10-02 11:29:09 -07:00
7d8a56e425 Merge pull request #16470 from tonistiigi/fix-aufs-opq
Add basic support for .wh..wh..opq
Upstream-commit: aa2e3247cb87a7a55fa0258b4ae92c026512ed2a
Component: engine
2015-10-02 11:28:33 -07:00
15faad6822 Merge pull request #16594 from Microsoft/sjw/unc-build-fix
Windows: Fixing longpath hanlding of UNC paths.
Upstream-commit: d04fd5e0dc4d84c5b7ab6e78d58a6d71ed739fef
Component: engine
2015-10-02 11:24:27 -07:00
f5fe88af39 Merge pull request #16680 from dnephin/update_list_image_api_docs
Update api docs for /images/json
Upstream-commit: d6f83652588fa39753a92fd046e8b837c0ac6cd4
Component: engine
2015-10-02 11:23:49 -07:00
0cd51b7f83 add regression test for mounting /dev/shm from host
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 934d9d632313acd338608ca1ad25c5270463e9c0
Component: engine
2015-10-02 11:14:08 -07:00
c09d7183ed do not mount /dev/shm or /dev/mqueue if we are mounting from the host
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b8605a11070af73713f2127d9e9d3e35bb78e1ab
Component: engine
2015-10-02 11:14:04 -07:00
8abb43049d Merge pull request #15472 from coolljt0725/fix_docker_ps_trucate_id
Fix docker ps truncate long image name
Upstream-commit: 830729bb94e8af8e6d9967da77673c13119cc00a
Component: engine
2015-10-02 18:56:55 +01:00
2a71b21783 Merge pull request #16707 from jfrazelle/fix-release
fix release script gpg key id
Upstream-commit: 970bc4b5c118f10754432d472e405457483a21dd
Component: engine
2015-10-02 10:13:51 -07:00
6f5edad812 Fix docker ps truncate long image name by default
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3fcf481361400acd5e56da2a8c76cf888092b2e4
Component: engine
2015-10-02 22:56:42 +08:00
b8616b16f4 Merge pull request #16076 from vbatts/export_image_times
graph: exported images times matching creation
Upstream-commit: 77da5d8feb5cf88446df0045240b4943ce4fc206
Component: engine
2015-10-01 21:50:43 +01:00
aae4517a8e fix release script gpg key id
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cb0ce5bb76aa57383760e9e6ac211a5a042ab89a
Component: engine
2015-10-01 13:22:33 -07:00
90b9ae3169 save: integration test for timestamp matching
The `docker save`ed output ought to have matching timestamp to the layer
creation.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: e4478caddf78700bd42f94eb382ae1805a443618
Component: engine
2015-10-01 14:38:55 -04:00
f0e2172183 Merge pull request #16698 from rhvgoyal/drop-redundant-lock
devmapper: Drop redundant lock and redundant function
Upstream-commit: 99d13e7e148eb046479531c89040bd29cff5b7ac
Component: engine
2015-10-01 10:48:03 -07:00
5b5431a0c1 Fixed file modified time not changing on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 40b77af234319f02029368732249c2de0babb380
Component: engine
2015-10-01 10:45:32 -07:00
93ac7b58ff Merge pull request #16687 from jfrazelle/update-man8
ignore man8
Upstream-commit: b26bcfe9beb332a7937d3e96aa7094b10ab8e9fd
Component: engine
2015-10-01 10:23:56 -07:00
dd16e8281b ignore man8
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cf8688c235d1edc70fcb4f97c0c3a3843c95a77a
Component: engine
2015-10-01 10:05:51 -07:00
42e7721be4 devmapper: Get rid of metaData.devicesLock
Right now we seem to have 3 locks. 

- devinfo.lock
  This is a per device lock

- metaData.devicesLock

  This is supposedely protecting map of devices.

- Global DeviceSet lock

  This is protecting map of devices as well as serializing calls to libdevmapper.

Semantics of per devices lock and global deviceset lock seem to be very clear.
Even ordering between these two locks has been defined properly.

What is not clear is the need and ordering of metaData.devicesLock. Looks like
this lock is not necessary and global DeviceSet lock should be used to
protect map of devices as it is part of DeviceSet.

This patchset gets rid of metaData.devicesLock and instead uses DeviceSet
lock to protect map of devices.

Also at couple of places during initialization takes devices.Lock(). That
is not strictly necessary as there is supposed to be one thread of execution
during initializaiton. Still it makes the code clearer.

I think this makes code more clear and easier to understand and easier to
make further changes.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 289145ecc6c016b8bb6797cc50905e34da911e84
Component: engine
2015-10-01 13:02:55 -04:00
644e005e90 devmapper: Get rid of unused function HasActivatedDevice()
Looks like nobody is calling HasActivatedDevice(). Get rid of it.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 73f8b46d84e73929eacafe4c2f9676469f862c49
Component: engine
2015-10-01 07:59:12 -04:00
8bb7196f95 Windows: Fixing longpath hanlding of UNC paths.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 6d223febda5fd3f27824d9dda7de1b18e50d0be5
Component: engine
2015-09-30 19:36:08 -07:00
6479d844f2 devmapper: Move maxDeviceID check in loadMetadata
maxDeviceID is upper limit on device Id thin pool can support. Right now
we have this check only during startup. It is a good idea to move this
check in loadMetadata so that any time a device file is loaded and if it
is corrupted and device Id is more than maxDevieceID, it will be detected
right then and there.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 94caae2477f42b55adeab22f14bcef22b90373d6
Component: engine
2015-09-30 18:54:06 -04:00
67663efaad devmapper: Use deactivateDevice() instead of removeDevice() in deleteDevice()
Use deactivateDevice() instead of removeDevice() directly. This will make
sure for device deletion, deferred removal is used if user has configured
it in. Also this makes reading code litle easier as there is single function
to remove a device and that is deactivateDevice().

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 39081eb3aa8f715c1da6f798c6531efd7a8a494c
Component: engine
2015-09-30 18:54:06 -04:00
e4c6aa28bc Merge pull request #16683 from rhvgoyal/fix-couple-of-bugs
devmapper: Fix a bug and fix a comment and add one reliability check
Upstream-commit: 8ebd0c972aaa9c24058ace74b72d10d4c1ef0613
Component: engine
2015-09-30 15:17:29 -07:00
b4ca40211f Merge pull request #16564 from calavera/versioned_types
Extract api types to version packages.
Upstream-commit: 0e9b0806f5b4b882550efdda3587abaabaa1a4c8
Component: engine
2015-09-30 23:28:10 +02:00
c2f2e9b032 Merge pull request #16684 from estesp/lets-update-runc-again
Update runc to fba07bce72e72ce5b2dd618e4f67dd86ccb49c82
Upstream-commit: 826ebc9333835a8f6492023afeae7302d05a419f
Component: engine
2015-09-30 14:07:29 -07:00
906e8ce80c Merge pull request #16629 from sdurrheimer/cluster-options-zsh-completion
Add zsh completion for --cluster-store and --cluster-advertise
Upstream-commit: 825f1a7e286699d3f4bc03e657fd37f8a7a68aed
Component: engine
2015-09-30 20:48:25 +01:00
2ea3ca61f9 Merge pull request #16622 from albers/completion-cluster
bash completion for #16229
Upstream-commit: f22674a5f07a483c14d7d93ff27fa4dc1c9b1353
Component: engine
2015-09-30 20:46:45 +01:00
b7328b026e Update runc to fba07bce72e72ce5b2dd618e4f67dd86ccb49c82
Fixing user namespaces (again) with a vendor update from runc
(specifically, the remount() only if special flags change)

Other changes are very minimal.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: b7a009cc1c9747cab4ebf40e609068c86f34d19d
Component: engine
2015-09-30 15:33:23 -04:00
7fb23fc9ef devmapper: Fail device deletion early if device is still mounted
If a device is still mounted at the time of DeleteDevice(), that means
higher layers have not called Put() properly on the device and are trying
to delete it. This is a bug in the code where Get() and Put() have not been
properly paired up. Fail device deletion if it is still mounted.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: e97e46b7376c3195383636d305d832b2ba3f82c5
Component: engine
2015-09-30 15:21:22 -04:00
91a056571d devmapper: Fix comments and for HasDevice() and Exists()
Exists() and HasDevice() just check if device file exists or not. It does
not say anything about if device is mounted or not. Fix comments.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: f5c0eb9ffe9a9d30ac6ff81fa1a4c216908189a6
Component: engine
2015-09-30 15:21:22 -04:00
9dabe752c1 devmapper: Do not load transaction meta file in device Hash map
device has map (device.Devices), contains valid devices and we skip all
the files which are not device files. transaction metadata file is not
device file. Skip this file when devices files are being read and loaded
into map.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: ba02bf31cbffe329e549516e0004cf113ab4517e
Component: engine
2015-09-30 15:21:22 -04:00
88fdfee4f9 Merge pull request #16678 from tklauser/moar-names
Add more amazing people to the names generator
Upstream-commit: ec25a447323a910ae92bccd485dd6d84ca6a9d4b
Component: engine
2015-09-30 12:06:07 -07:00
4c0ba86867 Extract api types to version packages.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 61634758c42014543e0ce429587bbba7fc6106ec
Component: engine
2015-09-30 14:14:27 -04:00
568946688a Merge pull request #16385 from RichardScothern/v1-deprecation
Add a daemon flag to prevent contact with v1 registries.
Upstream-commit: 85244f80e324428cef3dc526d1c831ed20eac6c2
Component: engine
2015-09-30 10:10:06 -07:00
85d177c805 Fix api documenation for /images/json response format
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e5967d041d8cb57cc4ddeee6783580d9be3415f2
Component: engine
2015-09-30 12:24:34 -04:00
bc369be3ad Merge pull request #16539 from calavera/router_interfaces
Separate API router from server.
Upstream-commit: 4f677df0d1fe1cdb24ecacd16f8692a6c46ffc21
Component: engine
2015-09-30 11:51:30 -04:00
21208aeb12 Add more amazing people to the names generator
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: d762dcd147e379ba57b21e0dee6f615e3f54938e
Component: engine
2015-09-30 16:13:51 +02:00
af103c04cf Merge pull request #16642 from vdemeester/remove-question-make-in-pkg-devicemapper
Remove "(?)" from comments in pkg/devicemapper
Upstream-commit: 31b882e793f14e13b9b9d023d12fed69a4f4b118
Component: engine
2015-09-30 09:39:23 -04:00
d0e8d580f1 Merge pull request #16562 from Microsoft/10662-fixhttppull
Windows: Fix ADD from URL in dockerfile
Upstream-commit: c3009783700154b6f0ad26bb492ddda9da783ad4
Component: engine
2015-09-30 11:46:57 +02:00
376a910561 Remove (?) from comments in pkg/devicemapper
Got merged with it, removing it as it doesn't add anything.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1dcb7d9e40d0ee5f9ab068fed55d3072246ce8ec
Component: engine
2015-09-30 10:35:02 +02:00
a1b5e8a4f8 Merge pull request #16580 from coolljt0725/unpause_all_container_on_exit
Make sure the container will always be unpaused on test exit
Upstream-commit: 729c9a97822ebee2c978a322d37060454af6bc66
Component: engine
2015-09-29 21:44:23 -04:00
c48d02c824 Merge pull request #16666 from calavera/golint_graph_windows
Fix golint issues on the windows graph driver.
Upstream-commit: 36592a4bc2c50cf8c84c494f467057c989475a1b
Component: engine
2015-09-29 17:36:37 -07:00
2a8c716e73 Merge pull request #16650 from cpuguy83/no_named_volumes_for_builder
Do not parse config.Volumes for named volumes
Upstream-commit: ae03e544e78dd478c72021fa72fd91351553fba5
Component: engine
2015-09-29 17:04:29 -07:00
1fb74bb17c Separate API router from server.
Implement basic interfaces to write custom routers that can be plugged
to the server. Remove server coupling with the daemon.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: da982cf5511814b6897244ecaa9c016f8800340a
Component: engine
2015-09-29 19:43:03 -04:00
e5db2c0e2f Merge pull request #16659 from tiborvass/revert-context
Remove custom context package and use golang's only for api/server
Upstream-commit: 144abf2a58b9ad3ca4cb23b48e8a0b5e288962c3
Component: engine
2015-09-29 16:11:24 -07:00