p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,108 Commits 2 Branches 295 Tags
50ca4df48841fa4dc62d3c3ec43b67afcb7e34ae
Commit Graph

12108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
50ca4df488 Add test to enforce volume build content 
This tests ensures that the content from a dir within a build is carried
over even if VOLUME for that dir is specified in the Dockerfile.  This
test ensures this long standing functionality.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4856ec075422a7926b62762749a7fbcc869efa99
Component: engine
 2014-12-12 11:15:31 -08:00
Alexander Morozov
f849a48354 Merge pull request #9621 from rgreinho/issue/9469 
Report number of times that docker has auto-restarted a container
Upstream-commit: d7d981bf3a0ef4fba563cde0d372f2a1373a70e9
Component: engine
 2014-12-12 10:13:37 -08:00
Rémy Greinhofer
1f4328ca63 Report number of times that docker has auto-restarted a container 
Fixes #9469.

Signed-off-by: Rémy Greinhofer <remy.greinhofer@livelovely.com>
Upstream-commit: 8f8d24cb1c762e74833bbb9b6e2b58438b42d36b
Component: engine
 2014-12-12 09:40:11 -08:00
Tibor Vass
4a6d7adac0 Merge pull request #9627 from jfrazelle/release-notes 
Include Fred's release notes for 1.4.0.
Upstream-commit: a9ecd2116bded0087a4128623269144cfc09ad52
Component: engine
 2014-12-12 12:29:09 -05:00
Jessica Frazelle
e5b08a1313 Include fred's release notes for 1.4.0. 
He is unfortunately out of power and internet because of storms :(

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a65396b079c1b05255553af8cde3a94d7796e752
Component: engine
 2014-12-11 19:00:34 -08:00
Jessie Frazelle
98f4a5ba65 Merge pull request #9606 from LK4D4/fix_race_in_test 
Fix race in TestDaemonRestartWithVolumesRefs
Upstream-commit: c60e60a184cd8b07ea29f073585cb214408cdd7e
Component: engine
 2014-12-11 18:27:38 -08:00
Alexander Morozov
88fcffd088 Merge pull request #9624 from icecrime/silence_loginwithouttty_test 
Suppress output of TestLoginWithoutTTY
Upstream-commit: a07835d876b8c8f1991868cc6f1c9b3e2726eaec
Component: engine
 2014-12-11 18:26:58 -08:00
Michael Crosby
1018b62fc8 Merge pull request #9599 from LK4D4/no_release_non_own 
Don't try release network in non-private modes
Upstream-commit: 14a82de6fa1c3a2fa2e2f136b07be66b47445cdb
Component: engine
 2014-12-11 18:25:00 -08:00
Tibor Vass
162a0281e9 Merge pull request #9623 from jfrazelle/merge_release_v1.4.0 
Merge release v1.4.0
Upstream-commit: 5a26b89751a4be0fa9017725579c0ad315f3a291
Component: engine
 2014-12-11 21:24:28 -05:00
Arnaud Porterie
6a7248c5b7 Suppress output of TestLoginWithoutTTY 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 1cab340c10be71382a8cfde8402f475d503c94be
Component: engine
 2014-12-11 18:05:07 -08:00
Jessica Frazelle
02f274f524 Fix conflicts. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: fd831b4c5e50a3f1de8eb506016ffe89d5cac8d4
Component: engine
 2014-12-11 17:14:53 -08:00
Jessica Frazelle
598ae24e5e Change version to 1.4.0-dev 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c509835475f4f222400e6a4d2211c59e41329817
Component: engine
 2014-12-11 17:00:43 -08:00
Jessie Frazelle
ee8f895256 Merge pull request #9345 from jfrazelle/bump_v1.4.0 
Bump version to 1.4.0
Upstream-commit: 0e4e200071379f4a4bef638bba90ff72539a5e62
Component: engine
 2014-12-11 16:31:29 -08:00
Jessica Frazelle
1ad288d656 Bump version to v1.4.0 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 4595d4fb03093acf87b905bebc5ba4964d7c0707
Component: engine
 2014-12-11 15:00:44 -08:00
Jessica Frazelle
24fce77535 Merge branch master into bump_v1.4.0 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: debf60b4665dc2bc7f11cad5a996a5fa05fe2112
Component: engine
 2014-12-11 15:00:03 -08:00
Jessie Frazelle
d60ea06db7 Merge pull request #9616 from cyphar/9608-builder-fix-incomplete-chown-walk-addcontext 
builder: internals: fix incomplete chown walk when fixing permissions
Upstream-commit: ce1393cb553fba082e2a3cf349c7325f4ae6bc7e
Component: engine
 2014-12-11 13:54:08 -08:00
Michael Crosby
db34b4e772 Merge pull request #9620 from tiborvass/merge_release_v1.3.3 
Merge release v1.3.3
Upstream-commit: 4d318db749f4b276bfc8563d931c1ec07b128577
Component: engine
 2014-12-11 13:53:32 -08:00
Tibor Vass
a9aac14d67 Change version to 1.3.3-dev 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 9f48be69e5c315f4e08390e796fbceaed3ed92e0
Component: engine
 2014-12-11 16:35:22 -05:00
unclejack
e7b124613e Bump version to v1.3.3 
Conflicts:
	VERSION

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 5b851982da2b4fc4c42a7ad0279c65f8d1de08de
Component: engine
 2014-12-11 16:33:20 -05:00
Tibor Vass
b544394ad7 docs: Add release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: fdabd6b14e394721aaf61402bb88073e7eb424bf
Component: engine
 2014-12-11 16:29:28 -05:00
unclejack
24d7379326 validate image ID properly & before load 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

Conflicts:
	graph/load.go
Upstream-commit: bff1d9dbce76bed1e267a067eb4a1a74ef4da312
Component: engine
 2014-12-11 16:29:27 -05:00
Arnaud Porterie
67b329feba Add integration test for xz path issue 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>

Conflicts:
	integration-cli/docker_cli_build_test.go
Upstream-commit: af2021955cb01507984cbd076edaf3caaf5b89b3
Component: engine
 2014-12-11 16:29:15 -05:00
Michael Crosby
d25c7e6450 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

Conflicts:
	pkg/archive/archive.go
Upstream-commit: 001ac15b54686761960352103ebf4ff2c6e1d803
Component: engine
 2014-12-11 16:29:13 -05:00
Michael Crosby
a176492278 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

Conflicts:
	pkg/archive/diff.go
	pkg/chrootarchive/diff.go
Upstream-commit: 7862f831fe99a221a0499b7764a8709e5f463bb9
Component: engine
 2014-12-11 16:28:24 -05:00
Cristian Staretu
a013d9f804 Add build tests covering extraction in chroot 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: e4ba82d50ee4642412a1e1bdf43a7b94fadd2428
Component: engine
 2014-12-11 16:26:52 -05:00
unclejack
273d3a2f40 integ-cli: add test for links in volumes 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: a57eee2229c2f0c53c32372587fcc2a8327044ea
Component: engine
 2014-12-11 16:26:52 -05:00
unclejack
e6c672e7d3 integ-cli: add build test for absolute symlink 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 7496cbbccc278c084620661812ed5f6390c1d2f1
Component: engine
 2014-12-11 16:26:52 -05:00
Tibor Vass
dedefc8fcd Add another symlink breakout test 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	integration-cli/docker_cli_build_test.go
Upstream-commit: 0e71a48d4e89ce40c0ab94cc18599481d9e8a6b0
Component: engine
 2014-12-11 16:26:51 -05:00
Tibor Vass
c828e1305e symlink: add more tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 5f0f0c228d438f01c3b9837eb6e8e97133d9d1f5
Component: engine
 2014-12-11 16:26:01 -05:00
Tibor Vass
9e40785aa2 symlink: cleanup names and break big test into multiple smaller ones 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: ff4d05ed73dfff44f9bb919a0a6fccff17f866a9
Component: engine
 2014-12-11 16:26:01 -05:00
Tibor Vass
8345114eb4 Refactor of symlink tests to remove testdata dir 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: b7f352b0fb7159af283275437ad69142addab13b
Component: engine
 2014-12-11 16:26:01 -05:00
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
Tibor Vass
fedd30320e Merge pull request #9617 from tiborvass/bump_v1.3.3 
Bump v1.3.3
Upstream-commit: be8f9a23134c7a63ef1d2d43bde558341f094d41
Component: engine
 2014-12-11 15:31:43 -05:00
Aleksa Sarai
c0c6361cf0 builder: internals: fix incomplete chown walk when fixing permissions 
This patch fixes the permission fixing code used by addContext, which
would not be responsible for Lchown-ing top-level directories added to a
destination that didn't exist prior to untar-ing the context.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 916cba9c587a3f3ce97b407993fecd96ac2fecaf
Component: engine
 2014-12-12 06:07:16 +11: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
unclejack
a4df086351 Bump version to v1.3.3 
Upstream-commit: d3446258471733fe667f0abdf015ee3ebd2f3485
Component: engine
 2014-12-11 17:37:17 +02:00
Hans Rødtang
8273ff6e18 Updated cover tool import path. 
Signed-off-by: Hans Rødtang <hansrodtang@gmail.com>
Upstream-commit: 496c2748cfef82fea3f5e1be5fbf845b478420aa
Component: engine
 2014-12-11 17:37:17 +02:00
Vincent Batts
16563e3c7c Merge pull request #9604 from crosbymichael/registry-fruit-loops 
Prevent infinite loop with var overshadowing
Upstream-commit: 6700580bbc92525ac0a848103dca7649d60b4f2f
Component: engine
 2014-12-11 10:36:47 -05:00
Alexandr Morozov
41b0254a74 Fix race in TestDaemonRestartWithVolumesRefs 
Sometimes rm begins before process death, but Kill called already after
it, so we get error - no such process.

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 0d70ad1c7205ba9e82dd1f244d26df93dc79de9e
Component: engine
 2014-12-10 20:55:51 -08:00
Michael Crosby
807e0b468d Refactor put image function's redirect loop 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 9a7a1e5be01b829e64b32a8b0f1d260f0a2a45c3
Component: engine
 2014-12-10 18:11:27 -08:00
Michael Crosby
e42acc43c3 Prevent loop with var overshadowing 
Incase of a 3xx redirect the var was being overshowed and ever changed
causing an infinite loop.

Fixes #9480

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 3b4de1070fac41c400c22f200438c90823e7769d
Component: engine
 2014-12-10 17:43:21 -08:00
Tibor Vass
52e73d6504 docs: Add release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: ee8504bc5ace8d3352166f1f2dce91b56fd9ad91
Component: engine
 2014-12-10 18:19:10 -05:00
James Turnbull
8ccacca9b5 Merge pull request #9566 from jfrazelle/btrfs-overlayfs 
add note to docs about overlay + btrfs unsupported
Upstream-commit: eba451b6595e72ab7bb23af5ba76ce0038a81d00
Component: engine
 2014-12-11 09:32:10 +11:00
Jessica Frazelle
a9df8138c1 add note to docs about overlay + btrfs 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 340ea25ac1c01561399175e4de8cecc2928ccf4b
Component: engine
 2014-12-10 14:29:41 -08:00
Alexandr Morozov
d44cc14dce Don't try release network in non-private modes 
Fixes #9594

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: b3ade99a7822f4edb21400a1003ff0e3893caa38
Component: engine
 2014-12-10 11:59:32 -08:00
Alexander Morozov
e5912031f0 Merge pull request #9597 from icecrime/9467-chown_regression 
Fix permissions on ADD/COPY
Upstream-commit: 5ca4ba9ed0fcf7df0ee40e4212d0415e112080e7
Component: engine
 2014-12-10 11:47:33 -08:00
Arnaud Porterie
5231d38261 Fix permissions on ADD/COPY 
Fix a regression introduced in PR#9467 when a single file was added or
copied.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: cfc24769a26e825e4267cbfdd59af807e27508b9
Component: engine
 2014-12-10 11:09:03 -08:00
Michael Crosby
6d8465a765 Merge pull request #9582 from Mic92/tls_interactive_exec 
Fix interactive TLS postContainersAttach
Upstream-commit: b905f88ee55d562cf3b8a780fc03f51eddf391c8
Component: engine
 2014-12-10 10:37:50 -08: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
Jörg Thalheim
3f619723e5 Fix interactive TLS postContainersAttach 
related to 266a1044deb9a085ed43dccdc6

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: a25168d28d552c33988c1a0f3d6a54355c246566
Component: engine
 2014-12-10 08:57:38 +01:00