eb11479882
devmapper: Use device id as specified by caller
...
Currently devicemapper CreateDevice and CreateSnapDevice keep on retrying
device creation till a suitable device id is found.
With new transaction mechanism we need to store device id in transaction
before it has been created.
So change the logic in such a way that caller decides the devices Id to
use. If that device Id is not available, caller bumps up the device Id
and retries.
That way caller can update transaciton too when it tries a new Id. Transaction
related patches will come later in the series.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 7b2b15d3e9f9b7ad898a36bbe5ceb42c9ca58d47
Component: engine
2014-12-03 13:06:43 -05:00
efbc3f4d55
Fix TarSum iteration test
...
I noticed that 3 of the tarsum test cases had expected a tarsum with
a sha256 hash of
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
As I've been working with sha256 quite a bit lately, it struck me that
this is the initial digest value for sha256, which means that no data
was processed. However, these tests *do* process data. It turns out that
there was a bug in the test handling code which did not wait for tarsum
to end completely. This patch corrects these test cases.
I'm unaware of anywhere else in the code base where this would be an issue,
though we definitily need to look out in the future to ensure we are
completing tarsum reads (waiting for EOF).
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 8d9e25dbddc189f4094e0f25a90f2b8a25deec9d
Component: engine
2014-12-02 15:28:13 -08:00
7bc79faafb
graphdb: initialize the database semi-idempotently on every connection.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: fb06e1c6ebcf5408e6a7d0bfcf9264571eab69a1
Component: engine
2014-12-02 03:02:25 -08:00
e1900eef38
Merge pull request #9407 from hqhq/hq_fix_comments
...
flag: fix the comments
Upstream-commit: 42522d29c7351d960e2346f1e19e0ac6f7ce7ad5
Component: engine
2014-12-01 11:27:06 -08:00
86e291ef5c
flag: fix the comments
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 9cc73c62e6779bf2c8eefc4192c017a2c73daf40
Component: engine
2014-11-30 01:58:16 +08:00
b86ab101dc
Change path breakout detection logic in archive package
...
Fixes #9375
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: be5bfbe2217905ba129588fe17264b96c866e26d
Component: engine
2014-11-28 09:44:47 -08:00
7b6399d928
Merge pull request #9006 from snitm/thin-pool-improvements
...
Thin pool improvements
Upstream-commit: b47ff77b5ce852bd830bc617d1c4e2c37e346281
Component: engine
2014-11-26 14:44:09 -05:00
326fa034ea
Merge pull request #9279 from yoheiueda/termios-via-cgo
...
Use termios via CGO
Upstream-commit: 79064a28203496c8f63510e73c32a7135f456a27
Component: engine
2014-11-25 20:04:26 -05:00
77c62b2fac
Cleanup ParseHost
...
Current implementation is comingling things that ought not be together.
There are _some_ similarities between parsing for the different proto
types, but they are more different than alike, making the code extremely
difficult to reason about.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: bd4fe9b9867c7633e520130b99e02798f49e6b44
Component: engine
2014-11-25 18:55:40 -05:00
fb0b016635
pkg/tarsum: add maintainers & add missing s
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 3db5ea1617549bbef7f645d4ecbf482ad1f31c71
Component: engine
2014-11-26 00:44:16 +02:00
fb15ffbdaa
Use termios via CGO only on Linux
...
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com >
Upstream-commit: dfcf05a5d070823ade84ffba0e9784cdfe6d54b0
Component: engine
2014-11-25 20:49:01 +09:00
3388d83b40
Fix to avoid a compilation error of size_test.go with GCCGO due to float to int truncation
...
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com >
Upstream-commit: 82a5cd0d3701fc559fb92290ed6bc2974a9d8b6d
Component: engine
2014-11-25 18:12:22 +09:00
132b9f8479
Revert "Fix to avoid a compile error due to float to int truncation with GCCGO"
...
This reverts commit 967a42f116d23051c862a3b4983925de2016f83c.
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com >
Roll back the change to fix the parameter of HumanSize from int64 to float64
Upstream-commit: 36560a76d71f1222122c9e6c82f76a609da564e9
Component: engine
2014-11-25 16:48:09 +09:00
ce14110804
tarsum: updates for jamtur01 comments
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 7f84174109b734fac309c02e4b474aeff9dfca15
Component: engine
2014-11-24 23:18:48 -05:00
230f6a737f
pkg/tarsum: review cleanup
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 3d6e63e0c4bab556fb8bd0abb65e4f7af35256fd
Component: engine
2014-11-24 23:18:48 -05:00
69cf264910
pkg/tarsum: review amendments
...
(separate commit to preserve github conversation)
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 3e08fb5ad2b882b12a396e258bc745254fac6f51
Component: engine
2014-11-24 23:18:48 -05:00
b9ee0de7eb
pkg/tarsum: specification on TarSum checksum
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: f30fee69b14a5fd9df9abb00498f2aff6e378bbe
Component: engine
2014-11-24 23:18:47 -05:00
ed716fd8a8
Merge pull request #9323 from unclejack/merge_release_v1.3.2
...
Merge release v1.3.2 to master
Upstream-commit: e6ec703df31f04c3ea3a6aeb19881494a6ae58ae
Component: engine
2014-11-24 19:26:36 -05:00
bb7432e3f1
Merge pull request #9324 from crosbymichael/git-urls
...
Move IsGIT and IsURL to urlutil package
Upstream-commit: 2ad98b0cfa355901d345ab361160439b1a283971
Component: engine
2014-11-24 16:07:42 -08:00
5861a679d7
Merge pull request #9173 from vbatts/vbatts-dm_clarify_TaskCreate
...
pkg/devicemapper: clarify TaskCreate and createTask
Upstream-commit: fc66a22df6c08f1434eb77991410a1359c5afa49
Component: engine
2014-11-24 15:45:54 -08:00
e0fcb513b1
Move git and url checks into pkg
...
This moves the IsGIT and IsURL functions out of the generic `utils`
package and into their own `urlutil` pkg.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: feca1b1780a0942aafc1796d1fd52026a673bf92
Component: engine
2014-11-24 18:10:37 -05:00
0a5e96f3d3
archive: do not call FollowSymlinkInScope in createTarFile
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: f6d9780229bfa52c86762d49a7a7e644dcd8f6df
Component: engine
2014-11-25 01:03:41 +02:00
05d1551428
pkg/chrootarchive: provide TMPDIR for ApplyLayer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 330171e1d9ec537d7f691fd63c697a0540589053
Component: engine
2014-11-25 01:03:41 +02:00
bc5bfe8ae5
archive: prevent breakout in ApplyLayer
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 31d1d733037b22591e2dd2edfe6c4d2d4b8086cc
Component: engine
2014-11-25 01:03:41 +02:00
89c9d8d1a2
archive: prevent breakout in Untar
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 1852cc38415c3d63d18c2938af9c112fbc4dfc10
Component: engine
2014-11-25 01:03:41 +02:00
588421ad7a
archive: add breakout tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
pkg/archive/archive.go
fixed conflict which git couldn't fix with the added BreakoutError
Conflicts:
pkg/archive/archive_test.go
fixed conflict in imports
Upstream-commit: 221617dbcd9431f14a3779d8bac9aba52f78ea21
Component: engine
2014-11-25 01:03:41 +02:00
8fc694c819
don't call reexec.Init from chrootarchive
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
daemon/graphdriver/aufs/aufs_test.go
fixed conflict caused by imports
Upstream-commit: 209deff9633b82198925846ebcb0a02191553005
Component: engine
2014-11-25 01:03:40 +02:00
9d0c84c559
pkg/chrootarchive: pass TarOptions via CLI arg
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Conflicts:
graph/load.go
fixed conflict in imports
Upstream-commit: 9c01bc249dc628280f3fc019d5f0e0ace71be248
Component: engine
2014-11-25 01:03:40 +02:00
dd4a9e5429
add pkg/chrootarchive and use it on the daemon
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
builder/internals.go
daemon/graphdriver/aufs/aufs.go
daemon/volumes.go
fixed conflicts in imports
Upstream-commit: 1cb17f03d0b217acf2d2c289b4946d367f9d3e80
Component: engine
2014-11-25 01:03:40 +02:00
efd16d2764
pkg/symlink: avoid following out of scope
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: faab87cc36fb6f02ddd53e1be09f10623a40773a
Component: engine
2014-11-25 00:27:05 +02:00
5dbc13abb8
Add missing unit testcase for new IsSet() func in mflag
...
Forgot to add this when I did PR #9259
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 88afbc4d94c4a803e936d602c620b8ab08e24acd
Component: engine
2014-11-22 05:37:36 -08:00
17175863b2
Merge pull request #9188 from somaopensource/8777-fix
...
Fix for #8777 (continuing PR #9061 )
Upstream-commit: d7626e97b61f5f8f5d585ec82d6154395a3f9404
Component: engine
2014-11-21 17:57:56 -08:00
e029685ee4
pkg/devicemapper: clarify TaskCreate and createTask
...
* Rename and expose createTask() to TaskCreateNamed()
* add comments
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: acdf766069f8e8c65fd3de3ce4f8efc15f421abd
Component: engine
2014-11-21 20:54:50 -05:00
5f6e6e9df3
Merge pull request #9183 from vbatts/dm_udevwait
...
devmapper: Call UdevWait() even in failure path
Upstream-commit: fb1540199e2a7fb8aaf7918a9a35d1f21adeaad5
Component: engine
2014-11-21 17:28:37 -08:00
664428ef8f
Merge pull request #9086 from vbatts/vbatts-tarsum_more_tests
...
pkg/tarsum: adding more tests
Upstream-commit: e820365b677cff6a5f3b073da1a3ebb21e5f8247
Component: engine
2014-11-21 17:12:55 -08:00
8d3c39cea7
Merge pull request #9261 from unclejack/fix_test_tmp_cleanup
...
fix cleanup of /tmp in tests
Upstream-commit: 0f2de5158fe66b4906de176f90e3e6d813336450
Component: engine
2014-11-21 08:48:04 -08:00
5192262c8e
Use termios via CGO
...
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com >
Upstream-commit: 244af451e9bdff5c87bca84e4c15193fc9eebc64
Component: engine
2014-11-21 22:12:03 +09:00
cbc7790607
Typed errors for iptables chain raw command output. YAYYYYYY.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 6cc75574b3b01fa4dfeeef585e52dbcf8da28586
Component: engine
2014-11-20 18:07:11 -08:00
b4f3f7d0fc
Merge pull request #9259 from duglin/Issue9221
...
Make --tlsverify enable tls regardless of value specified
Upstream-commit: 532e502e9c37d1caab59f9e8d188f6700b197ebb
Component: engine
2014-11-20 17:41:31 -08:00
3d66822e1d
Merge pull request #9248 from vbatts/vbatts-fix_gh9241
...
pkg/tarsum: actually init the TarSum struct
Upstream-commit: 5d67a3faea400273e4307db7990a51fc2d2ca0dc
Component: engine
2014-11-20 17:15:15 -08:00
f7e2fcdfb9
Make --tlsverify enable tls regardless of value specified
...
I also needed to add a mflag.IsSet() function that allows you to check
to see if a certain flag was actually specified on the cmd line.
Per #9221 - also tweaked the docs to fix a typo.
Closes #9221
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ae9bd580af55992974fcb94f73f72cc3b2257fec
Component: engine
2014-11-20 16:09:06 -08:00
0f9991ec4d
Revert "Support hairpin NAT"
...
This reverts commit 95a400e6e1a3b5da68431e64f9902a3fac218360.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 56c37536315d4c63c35b766e3335034e488e2189
Component: engine
2014-11-20 14:22:32 -08:00
39f1feb541
pkg/symlink: fix cleanup for tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 4508bd94b0efd07a0ef48cd090786615e6b8cbb7
Component: engine
2014-11-20 19:36:54 +02:00
86c00287ea
pkg/archive: fix TempArchive cleanup w/ one read
...
This fixes the removal of TempArchives which can read with only one
read. Such archives weren't getting removed because EOF wasn't being
triggered.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 32ba6ab83c7e47d627a2b971e7f6ca9b56e1be85
Component: engine
2014-11-20 19:34:35 +02:00
42efcf2e21
pkg/system: fix cleanup in tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 769b79866aa645d4deeeb0a44120cde7b046f0d1
Component: engine
2014-11-20 19:33:15 +02:00
313de46eb6
Fix for #8777
...
Now filter name is trimmed and lowercased before evaluation for case
insensitive and whitespace trimemd check.
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
Upstream-commit: 4deac03c65edf34affd66abd3ef8fb88287d2f5a
Component: engine
2014-11-20 13:36:46 +09:00
b6be906192
Add unit test for tarSum.Sum() with no data
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: e257863a9a2bff19c66355230483a8b6fa9de209
Component: engine
2014-11-19 15:55:21 -05:00
3898f51483
pkg/tarsum: actually init the TarSum struct
...
closes #9241
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 6a74f071afb4a69a1360ff1e84945745e578c349
Component: engine
2014-11-19 15:46:03 -05:00
bff9ea9dff
Fix to avoid a compile error due to float to int truncation with GCCGO
...
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com >
Upstream-commit: 967a42f116d23051c862a3b4983925de2016f83c
Component: engine
2014-11-19 15:06:49 +09:00
00bf60f5c4
Merge pull request #8937 from vbatts/vbatts-mount_optional_fields
...
pkg/mount: include optional field
Upstream-commit: 379c0da4648f7a8d62740b5c217cfac58f45ca10
Component: engine
2014-11-17 18:25:00 -08:00
