217c31e0e8
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: eac27ad46d7df4f11a28b84130ff484224f8b63d
Component: engine
2014-12-15 15:53:55 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a4df086351
Bump version to v1.3.3
...
Upstream-commit: d3446258471733fe667f0abdf015ee3ebd2f3485
Component: engine
2014-12-11 17:37:17 +02:00
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
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
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
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
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
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
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
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
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
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
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
5dee012669
Merge pull request #9588 from LK4D4/remove_stderr_from_build
...
Use Set for stderr "logs" job in builder
Upstream-commit: 3076115e2c313402aa91af1366ada66fab8a9112
Component: engine
2014-12-09 19:48:29 -08:00
3ecd658560
Use Set for stderr "logs" job in builder
...
Because engine implicitly adds his stder to job stderr
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: a62cbdeb47e5e504e670c546ad8bec45e696f370
Component: engine
2014-12-09 19:08:24 -08:00
f19d3d8426
Merge pull request #9318 from shishir-a412ed/doc-cpu-share
...
Enhanced description for 'docker run' command, -c/--cpu-shares flag
Upstream-commit: fb810d18bd27636097baec0eb8db85d1596cb0e5
Component: engine
2014-12-09 17:21:09 -08:00
1d39a69298
Forbid client piping to tty enabled container
...
Forbid `docker run -t` with a redirected stdin (such as `echo test |
docker run -ti busybox cat`). Forbid `docker exec -t` with a redirected
stdin. Forbid `docker attach` with a redirect stdin toward a tty enabled
container.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 67e3ddb75ff27b8de0022e330413b4308ec5b010
Component: engine
2014-12-09 14:30:49 -08:00
b4787aa54e
Add test for exec tty stdin close
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 243a640d3e593ee11e31ac55a4df8c887c2b09c9
Component: engine
2014-12-09 14:30:49 -08:00
6ca414da06
User should get error message on wrong config
...
closes #9501
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 8dcbd6ab636e756736cef5408710ff97fd207370
Component: engine
2014-12-09 21:52:07 +00:00
66843cd423
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
Upstream-commit: 994e4a1c69c5f48eeba679437fdd7b7ed7ab0fc5
Component: engine
2014-12-09 23:16:03 +02:00
a5d4e8f098
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 >
Upstream-commit: 0de96a81636e27a6b7cf3a34a62419545d030234
Component: engine
2014-12-09 14:56:17 -05:00
023722e3bb
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
Upstream-commit: c8fc8768b672b06bd0cf38d65da8ba03016b85b2
Component: engine
2014-12-09 14:56:17 -05:00
9f19621ed8
Fix chroot untar for zero padded archive from slow reader
...
Signed-off-by: Lewis Marshall <lewis@lmars.net >
Upstream-commit: f2008c535943669a4db89e3b9927a75121effbd5
Component: engine
2014-12-09 14:56:16 -05:00
ed1287419c
validate image ID properly & before load
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: acf1720b3f6035f0ab2c9658371ae8302851ffa3
Component: engine
2014-12-09 14:56:16 -05:00
94c64ce8e8
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: 0e9a7bc3cea20db258176b6f923c2b9cd009334f
Component: engine
2014-12-09 14:56:16 -05:00
ea53874af1
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
Upstream-commit: 313a1b7620910e47d888f8b0a6a5eb06ad9c1ff2
Component: engine
2014-12-09 14:56:16 -05:00
12026cb912
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
Upstream-commit: 62d83404b5f4c9ecdc21e8cab2306a933ce0cdbc
Component: engine
2014-12-09 14:56:16 -05:00
0e2e573fb5
Add build tests covering extraction in chroot
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: aef842e7dfb534aba22c3c911de525ce9ac12b72
Component: engine
2014-12-09 14:56:16 -05:00
41c7d48d95
integ-cli: add test for links in volumes
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: e629e255d89759ade9b46fecf413c2ba6765f7dd
Component: engine
2014-12-09 14:56:16 -05:00
7e26fea20c
integ-cli: add build test for absolute symlink
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 134f8e6b474d07e12712e0f2d55b901246e6482e
Component: engine
2014-12-09 14:56:16 -05:00
