clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-08 06:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,124 Commits 9 Branches 112 Tags
v1.3.3
Commit Graph
779 Commits
Author SHA1 Message Date
Alexandr Morozov 994e4a1c69 Change path breakout detection logic in archive package 
Fixes #9375

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>

Conflicts:
	integration-cli/docker_cli_cp_test.go
		removed extra test
 2014-12-09 23:16:03 +02:00
Michael Crosby c8fc8768b6 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>

Conflicts:
	pkg/chrootarchive/diff.go
 2014-12-09 14:56:17 -05:00
Lewis Marshall f2008c5359 Fix chroot untar for zero padded archive from slow reader 
Signed-off-by: Lewis Marshall <lewis@lmars.net>
 2014-12-09 14:56:16 -05:00
Michael Crosby 313a1b7620 Decompress archive before streaming the unpack in a chroot 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	pkg/archive/archive.go
	pkg/chrootarchive/archive.go
 2014-12-09 14:56:16 -05:00
Michael Crosby 62d83404b5 Update chroot apply layer to handle decompression outside chroot 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	pkg/archive/diff.go
	pkg/chrootarchive/archive.go
 2014-12-09 14:56:16 -05:00
Tibor Vass 566146bc13 symlink: add more tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-09 14:56:16 -05:00
Tibor Vass 1ebafeb635 symlink: cleanup names and break big test into multiple smaller ones 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-09 14:56:16 -05:00
Tibor Vass 18193ae0a3 Refactor of symlink tests to remove testdata dir 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-09 14:56:16 -05:00
Tianon Gravi cd745d5c6e Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-12-09 14:56:16 -05:00
Tibor Vass b256616589 archive: do not call FollowSymlinkInScope in createTarFile 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-24 11:51:37 -05:00
unclejack 409f65bfd1 pkg/chrootarchive: provide TMPDIR for ApplyLayer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-24 11:51:37 -05:00
Tibor Vass 04175d0763 archive: prevent breakout in ApplyLayer 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-14 23:45:37 +02:00
Tibor Vass a111eea20c archive: prevent breakout in Untar 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-14 23:45:29 +02:00
Tibor Vass ea361c0476 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
 2014-11-14 23:44:20 +02:00
unclejack 8d90b0faf8 don't call reexec.Init from chrootarchive 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-11 23:20:16 +02:00
Tibor Vass 3ac6394b80 pkg/chrootarchive: pass TarOptions via CLI arg 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-11 23:20:09 +02:00
unclejack 0357b26c1b add pkg/chrootarchive and use it on the daemon 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-11 23:20:02 +02:00
unclejack 1d4a82365b pkg/archive: add interface for Untar 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-11 23:19:54 +02:00
unclejack d51a02091c pkg/reexec: move reexec code to a new package 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	integration/runtime_test.go
		fixed imports
 2014-11-11 23:19:34 +02:00
unclejack 662ca4114d pkg/symlink: avoid following out of scope 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-10 17:57:54 +02:00
shuai-z 1d1b813d25 removed redundant Clean 
The doc (or src) says: The result is Cleaned.

http://golang.org/pkg/path/filepath/#Join

Signed-off-by: shuai-z <zs.broccoli@gmail.com>
 2014-11-10 17:57:01 +02:00
Michael Crosby 4c8b8861ec Merge pull request #8350 from erikh/add_erikh_maintainer_proxy 
Add erikh as maintainer of pkg/proxy
 2014-10-01 15:50:41 -07:00
Erik Hollensbe 10efa07fa2 Add erikh as maintainer of pkg/proxy 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-01 15:37:46 -07:00
Rafe Colton 30d5a42c1f Move archive package into pkg/archive 
Now that the archive package does not depend on any docker-specific
packages, only those in pkg and vendor, it can be safely moved into pkg.

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
 2014-09-29 23:23:36 -07:00
Rafe Colton 73f4bfed81 Move Matches() file path matching function into pkg/fileutils 
This is the second of two steps to break the archive package's
dependence on utils so that archive may be moved into pkg. `Matches()`
is also a good candidate pkg in that it is small, concise, and not
specific to docker internals

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
 2014-09-29 23:21:41 -07:00
Rafe Colton b845a62149 Move Go() promise-like func from utils to pkg/promise 
This is the first of two steps to break the archive package's dependence
on utils so that archive may be moved into pkg.  Also, the `Go()`
function is small, concise, and not specific to the docker internals, so
it is a good candidate for pkg.

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
 2014-09-29 23:16:27 -07:00
Derek McGowan 5cdf7f5077 pkg/tarsum: fix panic with dynamic buffer 
When read is called on a tarsum with a two different read sizes, specifically the second call larger than the first, the dynamic buffer does not get reallocated causing a slice read error.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2014-09-25 15:58:35 -07:00
Alexandr Morozov 2add198a7a Test for jsonlog.WriteLog 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 19:19:25 +04:00
Alexandr Morozov 81c9927f8f Benchmark for jsonlog.WriteLog 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 18:24:18 +04:00
Victor Vieux 350b1cf6ea Merge pull request #5956 from vbatts/vbatts-tarsum_hashes 
tarsum: allow for generic hashes
 2014-09-22 11:11:25 -07:00
unclejack 473bb5274c pkg/jsonlog: avoid JSONLog allocation in loop 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-22 18:57:28 +03:00
Alexandr Morozov a7ee201ee8 Close logs pipes and catch write errors 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-22 10:55:46 +04:00
Alexandr Morozov fd3f2e175f Change unused WriteCloser to Writer 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-22 10:54:58 +04:00
Guillaume Dufour acea488eb6 FIX 6613:launch docker fail with space named drive 
Signed-off-by: Guillaume Dufour <guillaume.duff@gmail.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-19 12:07:53 -04:00
Michael Crosby d5537e0f03 Merge pull request #6950 from jfrazelle/6831-check-flag-centos6.5 
Fix duplicate iptables rules
 2014-09-18 17:51:15 -07:00
Vincent Batts 4e9925d780 tarsum: allow for alternate block ciphers 
Not breaking the default cipher and algorithm for calculating checksums,
but allow for using alternate block ciphers during the checksum
calculation.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-09-18 10:34:58 -04:00
Michael Crosby 77d30e7112 Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter 
lower the number of allocations in broadcastwriter
 2014-09-17 15:26:44 -07:00
unclejack 458b019e62 Merge pull request #7889 from vbatts/vbatts-tarsum_name_collision 
tarsum: name collision fix
 2014-09-17 21:59:39 +03:00
Vincent Batts c5e6362c53 tarsum: name collision fix 
If a tar were constructed with duplicate file names, then depending on
the order, it could result in same tarsum.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-09-17 14:37:46 -04:00
Alexandr Morozov 55cac6c942 Benchmark for StdWriter.Write 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-17 19:24:07 +04:00
unclejack 277aa9c674 stdcopy: improve perf by avoiding buffer growth 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 18:06:17 +03:00
unclejack 1f03e60c2a move stdcopy to pkg/stdcopy 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 18:06:17 +03:00
unclejack 9851e8c4c1 use custom marshalling for JSONLog 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 17:03:54 +03:00
unclejack 9ae3134dc9 add the timeutils package 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 14:30:08 +03:00
Vincent Batts 0a6fd743ea Merge pull request #8063 from jlhawn/tarsum_empty_tar_archive 
tarsum: correct close and finish reads
 2014-09-16 15:41:28 -04:00
Tibor Vass 28f09f0632 Merge pull request #8059 from estesp/8057-refactor-regexp-to-package-var 
Refactor all pre-compiled regexp to package level vars
 2014-09-16 15:04:23 -04:00
Phil Estes 4119c9d7d9 Refactor all pre-compiled regexp to package level vars 
Addresses #8057

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2014-09-16 12:57:44 -04:00
Josh Hawn bc956c6b79 Correct tarsum finish logic 
Tarsum now correctly closes the internal TarWriter which appends
a block of 1024 zeros to the end of the returned archive.

Signed-off-by: Josh Hawn <josh.hawn@docker.com>
 2014-09-16 09:34:21 -07:00
Vincent Batts 0ecafb8a69 tarsum: version the addition of xattrs 
Now that TarSum can be versioned, move the addition of xattr headers in
to the next version of TarSum

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-09-15 16:08:05 -04:00
Vincent Batts 448c8ecb0f tarsum: include xattr headers in to the checksum 
this is to enhance the tarsum algorithm, but _MUST_ be done in lock step
with the same for docker-registry. (PR will be cited)

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-09-15 15:05:01 -04:00