1
0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Commit Graph

891 Commits

Author SHA1 Message Date
Tianon Gravi
203304857b Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: fa3ec89515431ce425f924c8a9a804d5cb18382f
Component: engine
2014-12-11 16:26:01 -05:00
Vincent Batts
62c0414eca Merge pull request #9258 from rhvgoyal/transaction-id-improvements
devmapper fix usage of pool transaction id 
Upstream-commit: 74bbb935715a3f384a4a3a527053af5419f5a72e
Component: engine
2014-12-11 12:58:18 -05:00
Michael Crosby
7f9567ff56 Merge pull request #9099 from vbatts/vbatts-tarsum_spec
pkg/tarsum: specification on TarSum checksum algorithm
Upstream-commit: 428c263a6c2a0606a5eed25beaf2ef93da14a4b7
Component: engine
2014-12-10 10:24:48 -08:00
Michael Crosby
a4b445d2e9 Flush stdin from within chroot archive
This makes sure that we don't buffer in memory and that we also flush
stdin from diff as well as untar.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d1535131d259bb8a980770d47c0865a1be4373e3
Component: engine
2014-12-08 15:41:07 -08:00
Tibor Vass
d19caad485 Merge pull request #9539 from flynn/chroot-untar-empty-archive-slow
Fix chroot untar for zero padded archive from slow reader
Upstream-commit: c9285a08b161f31f37915f929252c9ba1a83ffa9
Component: engine
2014-12-08 17:59:21 -05:00
Erik Dubbelboer
c21c1c5984 Removed race condition
If two interrupts were fired really quickly interruptCount could have been incremented twice before the LoadUint32 making cleanup not being called at all.

Signed-off-by: Erik Dubbelboer <erik@dubbelboer.com>
Upstream-commit: 46b1194d996f6535e657bcb88428303305d3fe68
Component: engine
2014-12-06 22:52:19 +08:00
Lewis Marshall
6465d98afa Fix chroot untar for zero padded archive from slow reader
Signed-off-by: Lewis Marshall <lewis@lmars.net>
Upstream-commit: c128c134d71d01c555a6354d2ae7f6964f93df90
Component: engine
2014-12-06 02:44:31 +00:00
Alexander Morozov
93dd7fb297 Merge pull request #9479 from jlhawn/tarsum_test_fix
Correct TarSum benchmarks: 9kTar and 9kTarGzip
Upstream-commit: 984b072a37ee090bc24511137919211ec2fbb542
Component: engine
2014-12-05 14:47:54 -08:00
Josh Hawn
9d37d55377 Correctly close generated benchmark archives
Another update to TarSum tests, this patch fixes an issue where
the benchmarks were generating archives incorrectly by not closing
the tarWriter.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 385917e22c5bd0d577a5a0be0de9e88a0499fe87
Component: engine
2014-12-03 22:26:06 -08:00
Jessica Frazelle
de88b2cc7b Fix output format where no variable specified in mount pkg
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6fd818f3ef8ca018b74544362c37d41a1095ba9d
Component: engine
2014-12-03 19:02:51 -08:00
Jessie Frazelle
65e3ca93a1 Merge pull request #9451 from erikh/fix-sqlite
graphdb: initialize the database semi-idempotently on every connection, not just new installs.
Upstream-commit: 8520fd55b66b44f669f6ad6886c7c46d066bd6ca
Component: engine
2014-12-03 17:17:20 -08:00
Andy Goldstein
717d7acf81 Fix invalid argument error on push
With 32ba6ab from #9261, TempArchive now closes the underlying file and
cleans it up as soon as the file's contents have been read. When pushing
an image, PushImageLayerRegistry attempts to call Close() on the layer,
which is a TempArchive that has already been closed. In this situation,
Close() returns an "invalid argument" error.

Add a Close method to TempArchive that does a no-op if the underlying
file has already been closed.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: 48ec176cd51da20e23564941da2d9906a7779d28
Component: engine
2014-12-03 16:12:24 -05:00
Josh Hawn
54cbb45483 Correct TarSum benchmarks: 9kTar and 9kTarGzip
These two cases did not actually read the same content with each iteration
of the benchmark. After the first read, the buffer was consumed. This patch
corrects this by using a bytes.Reader and seeking to the beginning of the
buffer at the beginning of each iteration.

Unfortunately, this benchmark was not actually as fast as we believed. But
the new results do bring its results closer to those of the other benchmarks.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 92fd49f7ca42cf5d97825853034eac685b90fc1d
Component: engine
2014-12-03 10:44:05 -08:00
Vivek Goyal
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
Josh Hawn
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
Erik Hollensbe
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
Michael Crosby
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
Qiang Huang
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
Alexandr Morozov
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
Vincent Batts
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
Vincent Batts
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
Brian Goff
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
unclejack
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
Yohei Ueda
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
Vincent Batts
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
Vincent Batts
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
Vincent Batts
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
Vincent Batts
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
Tibor Vass
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
Jessie Frazelle
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
Michael Crosby
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
Michael Crosby
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
Tibor Vass
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
unclejack
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
unclejack
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
Tibor Vass
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
unclejack
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
unclejack
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
Doug Davis
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
Jessie Frazelle
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
Vincent Batts
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
Michael Crosby
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
Michael Crosby
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
Alexander Morozov
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
Yohei Ueda
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
Jessica Frazelle
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
Michael Crosby
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