clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-21 21:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,124 Commits 9 Branches 112 Tags
d3446258471733fe667f0abdf015ee3ebd2f3485
Commit Graph

11124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unclejack d344625847 Bump version to v1.3.3 v1.3.3 2014-12-11 17:37:17 +02:00
Hans Rødtang 496c2748cf Updated cover tool import path. 
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com>
 2014-12-11 17:37:17 +02:00
Tibor Vass ee8504bc5a docs: Add release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-10 18:19:10 -05:00
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
Arnaud Porterie 0de96a8163 Fix client-side HTTP hijacking over TLS 
Properly CloseWrite() the client socket once done with stdin when using
TLS connection (this used to rely on an erroneous type assertion).

Fixes #8658.
Fixes #8642.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: Michael Crosby <crosby.michael@gmail.com>
 2014-12-09 14:56:17 -05: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
unclejack acf1720b3f validate image ID properly & before load 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-09 14:56:16 -05:00
Arnaud Porterie 0e9a7bc3ce Add integration test for xz path issue 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

Conflicts:
	integration-cli/docker_cli_build_test.go
 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
Cristian Staretu aef842e7df Add build tests covering extraction in chroot 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-09 14:56:16 -05:00
unclejack e629e255d8 integ-cli: add test for links in volumes 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-09 14:56:16 -05:00
unclejack 134f8e6b47 integ-cli: add build test for absolute symlink 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-09 14:56:16 -05:00
Tibor Vass 1cd89729d5 Add another symlink breakout test 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 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 6f514d28c0 Merge pull request #9316 from tiborvass/bump_v1.3.2 
Bump v1.3.2
 2014-11-24 16:49:28 -05:00
Tibor Vass 39fa2faad2 Bump to version v1.3.2 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
v1.3.2 		2014-11-24 12:38:01 -05:00
Tibor Vass 324953d74a docs: Add 1.3.2 release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-24 12:38:01 -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
Derek McGowan 87f59e3802 Skip V2 registry and immediately fallback to V1 when mirrors are provided 
Since V2 registry does not yet implement mirrors, when mirrors are given automatically fallback to V1 without checking V2 first.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2014-11-14 15:30:58 -08:00
Tibor Vass c650d17a26 Rewrite documentation for insecure registries 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	docs/sources/reference/commandline/cli.md
 2014-11-14 14:20:19 -08:00
Tibor Vass 5e2d02ab73 Add the possibility of specifying a subnet for --insecure-registry 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/endpoint.go
 2014-11-14 14:20:19 -08:00
Tibor Vass eb3738347a registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-11-14 14:20:19 -08:00
Tibor Vass 6152460c1e Put mock registry address in insecureRegistries for unit tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/registry_mock_test.go
 2014-11-14 14:20:19 -08:00
Tibor Vass 1527979e87 registry: refactor registry.IsSecure calls into registry.NewEndpoint 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/endpoint.go
	registry/endpoint_test.go
	registry/registry_test.go
 2014-11-14 14:05:31 -08: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
Thomas Orozco 967f80f3cc Fix: Failed Start breaks VolumesFrom 
Running parseVolumesFromSpec on all VolumesFrom specs before initialize
any mounts endures that we don't leave container.Volumes in an
inconsistent (partially initialized) if one of out mount groups is not
available (e.g. the container we're trying to mount from does not
exist).

Keeping container.Volumes in a consistent state ensures that next time
we Start() the container, it'll run prepareVolumes() again.

The attached test demonstrates that when a container fails to start due
to a missing container specified in VolumesFrom, it "remembers" a Volume
that worked.

Fixes: #8726

Signed-off-by: Thomas Orozco <thomas@orozco.fr>

Conflicts:
	integration-cli/docker_cli_start_test.go
		cli integration test
 2014-11-12 00:14:04 +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
Josh Hawn 3ab5251f56 Use archive.CopyWithTar in vfs.Create 
The vfs storage driver currently shells out to the `cp` binary on the host
system to perform an 'archive' copy of the base image to a new directory.
The archive option preserves the modified time of the files which are created
but there was an issue where it was unable to preserve the modified time of
copied symbolic links on some host systems with an outdated version of `cp`.

This change no longer relies on the host system implementation and instead
utilizes the `CopyWithTar` function found in `pkg/archive` which is used
to copy from source to destination directory using a Tar archive, which
should correctly preserve file attributes.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2014-11-11 23:19:43 +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
Michael Crosby 0573b17b24 Add AppArmorProfile to container inspect json 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-10 21:04:17 +02:00
Michael Crosby c9379eb3fb Move security opts to HostConfig 
These settings need to be in the HostConfig so that they are not
committed to an image and cannot introduce a security issue.

We can safely move this field from the Config to the HostConfig
without any regressions because these settings are consumed at container
created and used to populate fields on the Container struct.  Because of
this, existing settings will be honored for containers already created
on a daemon with custom security settings and prevent values being
consumed via an Image.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-10 21:04:01 +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
Alexandr Morozov fd9c2ae27d Fix deadlock in ps exited filter 
Fixes #8909

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

Conflicts:
	integration-cli/docker_cli_ps_test.go
		fixed merge issue caused by missing tests
 2014-11-07 16:35:50 +02:00
unclejack 09c38a8d43 bump fpm to 1.3.2 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-11-07 16:18:53 +02:00
Tibor Vass 86292adbd9 Merge pull request #8861 from tiborvass/bump_v1.3.1 
Bump v1.3.1
 2014-10-30 12:43:43 -04:00
Tibor Vass 4e9bbfa900 Bump to version v1.3.1 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
v1.3.1 		2014-10-30 09:44:46 -04:00
Tibor Vass e6efbd6596 Fix login command 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-30 09:17:11 -04:00
Erik Hollensbe 9fc8b7f4e1 builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-30 09:17:11 -04:00