Commit Graph

18629 Commits

Author SHA1 Message Date
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
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
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
96c1825565 Merge pull request #16686 from rhvgoyal/more-fixes
devicemapper: A bug fix and a code improvement 
Upstream-commit: a3b04de401ec154048ce0aa7e86a4c239fd64439
Component: engine
2015-09-30 23:01:00 -04: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
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
eb95300866 Fix golint issues on the windows graph driver.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1fffc7a89dd69800317e881009188871906cce6a
Component: engine
2015-09-29 18:32:45 -04:00
a6a6684e96 Use golang.org/x/net/context in api/server/
This patch removes the internal context package and uses golang's
package instead.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 94e3b0f4288cdff767817b751e9a318e665ea7ac
Component: engine
2015-09-29 17:40:55 -04:00
ad77115889 Merge pull request #16656 from shishir-a412ed/man_docker_daemon_dns-opt
Add dns-opt option to docker daemon man page
Upstream-commit: 724b410c555a278d428929d125005d624d4a94a5
Component: engine
2015-09-29 14:07:43 -07:00
2f3a14e438 Merge pull request #16661 from brahmaroutu/gccgo_ci_stretchr_fix
Vendor in stretchr/testify to fix GCCGO issue with function name parsing (GCCGO CI)
Upstream-commit: 949270ba7ca3c93f25a13abf68d5e0e4c05be08a
Component: engine
2015-09-29 13:53:35 -07:00
681be8cc45 Vendor in stretchr/testify to fix GCCGO issue with function name parsing
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 81c42d6c1e7df423aa07674a38028abfa9522f51
Component: engine
2015-09-29 19:20:03 +00:00
69db6279aa Revert "Merge pull request #16228 from duglin/ContextualizeEvents"
Although having a request ID available throughout the codebase is very
valuable, the impact of requiring a Context as an argument to every
function in the codepath of an API request, is too significant and was
not properly understood at the time of the review.

Furthermore, mixing API-layer code with non-API-layer code makes the
latter usable only by API-layer code (one that has a notion of Context).

This reverts commit de4164043546d2b9ee3bf323dbc41f4979c84480, reversing
changes made to 7daeecd42d7bb112bfe01532c8c9a962bb0c7967.

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	api/server/container.go
	builder/internals.go
	daemon/container_unix.go
	daemon/create.go
Upstream-commit: b08f071e18043abe8ce15f56826d38dd26bedb78
Component: engine
2015-09-29 14:26:51 -04:00
fef14476a9 Revert "Merge pull request #16567 from calavera/context_per_request"
This reverts commit ff92f45be49146cd7ac7716c36d89de989cb262e, reversing
changes made to 80e31df3b6fdf6c1fbd6a5d0aceb0a148066508c.

Reverting to make the next revert easier.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 79c31f4b13d331d4011b2975a96dcdeab2036865
Component: engine
2015-09-29 13:40:46 -04:00
1e6abba179 Merge pull request #16570 from duglin/ReaderFix
Make Close() on simpleReaderCloser actually close the reader
Upstream-commit: 252af0ae2fe8cd68c527b8c5bf6e3dd1c23d8574
Component: engine
2015-09-29 12:55:03 -04:00
6ba4be05e8 Add dns-opt option to docker daemon man page
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 8db945abb96b983ef391b3513df38a368708e963
Component: engine
2015-09-29 12:31:51 -04:00
e87759cf33 Merge pull request #16649 from mtrmac/16648-test-text-fixups
Fix text not matching the actual tests
Upstream-commit: 4e0eb91c5577a0310366d699fbed3b213e7caa38
Component: engine
2015-09-29 12:01:19 -04:00
ca2ed97d93 Merge pull request #16611 from vdemeester/fix-TestAttachClosedOnContainerStop-racy-test
Fix TestAttachClosedOnContainerStop racey test
Upstream-commit: 992e464a80e880930817f7622d1b6a5ff63b1033
Component: engine
2015-09-29 11:49:24 -04:00
2f036a6241 Merge pull request #16641 from cpuguy83/16598_fix_TestExecStartFails
Make sure test container is running before exec
Upstream-commit: 499b76d2ecb97ed1e59c732770ccdad6a1c8b3b6
Component: engine
2015-09-29 11:25:14 -04:00
9346a064f4 Fix TestAttachClosedOnContainerStop racey test
This test is failing once in a while on the CI, because the docker
attach command might be called after the container ends.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 50852f3be3d09d8bf6957d2ff27c26966b871e80
Component: engine
2015-09-29 16:57:58 +02:00
5c97861d03 Make sure test container is running before exec
Fixes race in TestExecStartFails

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9077c8968950133fdfac9898a20f9887f8df78f2
Component: engine
2015-09-29 10:06:51 -04:00
4b1e83454e Do not parse config.Volumes for named volumes
Fixes an issue where `VOLUME some_name:/foo` would be parsed as a named
volume, allowing access from the builder to any volume on the host.

This makes sure that named volumes must always be passed in as a bind.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8e5bb8fdd37879ec04c3419b8ecfce7a0477cdcf
Component: engine
2015-09-29 10:01:57 -04:00
5950661408 Fix text not matching the actual tests
Also fixes a typo in image name.

Fixes #16648

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Upstream-commit: 8781367c77a915799dff2892f4506f085ac6b68b
Component: engine
2015-09-29 15:26:04 +02:00
1bdb03b312 Merge pull request #16635 from Microsoft/10662-fixtestrununknowncommand
TestRunUnknownCommand 30s, not 30ns
Upstream-commit: d6e7350b961d856dcc39db5accd898279d1be3da
Component: engine
2015-09-28 14:31:48 -07:00