clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-21 05:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,025 Commits 9 Branches 112 Tags
d04debddd983b3aa48ad38659d2c3debe794d374
Commit Graph

12025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Tombol d04debddd9 Fix #9462 
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
 2014-12-12 03:25:14 +01:00
Jessie Frazelle ce1393cb55 Merge pull request #9616 from cyphar/9608-builder-fix-incomplete-chown-walk-addcontext 
builder: internals: fix incomplete chown walk when fixing permissions
 2014-12-11 13:54:08 -08:00
Michael Crosby 4d318db749 Merge pull request #9620 from tiborvass/merge_release_v1.3.3 
Merge release v1.3.3
 2014-12-11 13:53:32 -08:00
Tibor Vass 9f48be69e5 Change version to 1.3.3-dev 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-11 16:35:22 -05:00
unclejack 5b851982da 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>
 2014-12-11 16:33:20 -05:00
Tibor Vass fdabd6b14e docs: Add release notes 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-11 16:29:28 -05:00
unclejack bff1d9dbce validate image ID properly & before load 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

Conflicts:
	graph/load.go
 2014-12-11 16:29:27 -05:00
Arnaud Porterie af2021955c 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-11 16:29:15 -05:00
Michael Crosby 001ac15b54 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
 2014-12-11 16:29:13 -05:00
Michael Crosby 7862f831fe 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
 2014-12-11 16:28:24 -05:00
Cristian Staretu e4ba82d50e Add build tests covering extraction in chroot 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-11 16:26:52 -05:00
unclejack a57eee2229 integ-cli: add test for links in volumes 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-11 16:26:52 -05:00
unclejack 7496cbbccc integ-cli: add build test for absolute symlink 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-11 16:26:52 -05:00
Tibor Vass 0e71a48d4e Add another symlink breakout test 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	integration-cli/docker_cli_build_test.go
 2014-12-11 16:26:51 -05:00
Tibor Vass 5f0f0c228d symlink: add more tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-11 16:26:01 -05:00
Tibor Vass ff4d05ed73 symlink: cleanup names and break big test into multiple smaller ones 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-11 16:26:01 -05:00
Tibor Vass b7f352b0fb Refactor of symlink tests to remove testdata dir 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-12-11 16:26:01 -05:00
Tianon Gravi fa3ec89515 Simplify FollowSymlinkInScope based on Go 1.3.3's EvalSymlinks 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-12-11 16:26:01 -05:00
Aleksa Sarai 916cba9c58 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)
 2014-12-12 06:07:16 +11:00
Vincent Batts 74bbb93571 Merge pull request #9258 from rhvgoyal/transaction-id-improvements 
devmapper fix usage of pool transaction id
 2014-12-11 12:58:18 -05:00
Vincent Batts 6700580bbc Merge pull request #9604 from crosbymichael/registry-fruit-loops 
Prevent infinite loop with var overshadowing
 2014-12-11 10:36:47 -05:00
Michael Crosby 9a7a1e5be0 Refactor put image function's redirect loop 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-12-10 18:11:27 -08:00
Michael Crosby 3b4de1070f 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>
 2014-12-10 17:43:21 -08:00
James Turnbull eba451b659 Merge pull request #9566 from jfrazelle/btrfs-overlayfs 
add note to docs about overlay + btrfs unsupported
 2014-12-11 09:32:10 +11:00
Jessica Frazelle 340ea25ac1 add note to docs about overlay + btrfs 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-12-10 14:29:41 -08:00
Alexander Morozov 5ca4ba9ed0 Merge pull request #9597 from icecrime/9467-chown_regression 
Fix permissions on ADD/COPY
 2014-12-10 11:47:33 -08:00
Arnaud Porterie cfc24769a2 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>
 2014-12-10 11:09:03 -08:00
Michael Crosby b905f88ee5 Merge pull request #9582 from Mic92/tls_interactive_exec 
Fix interactive TLS postContainersAttach
 2014-12-10 10:37:50 -08:00
Michael Crosby 428c263a6c Merge pull request #9099 from vbatts/vbatts-tarsum_spec 
pkg/tarsum: specification on TarSum checksum algorithm
 2014-12-10 10:24:48 -08:00
Jörg Thalheim a25168d28d Fix interactive TLS postContainersAttach 
related to 266a1044de

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2014-12-10 08:57:38 +01:00
Jessie Frazelle 3076115e2c Merge pull request #9588 from LK4D4/remove_stderr_from_build 
Use Set for stderr "logs" job in builder
 2014-12-09 19:48:29 -08:00
Alexandr Morozov a62cbdeb47 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>
 2014-12-09 19:08:24 -08:00
Michael Crosby fb810d18bd Merge pull request #9318 from shishir-a412ed/doc-cpu-share 
Enhanced description for 'docker run' command, -c/--cpu-shares flag
 2014-12-09 17:21:09 -08:00
Alexander Morozov fa7e01794f Merge pull request #9537 from icecrime/9476-tty_stdin_redirect 
Forbid client piping to tty enabled container
 2014-12-09 15:17:44 -08:00
Arnaud Porterie 67e3ddb75f 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>
 2014-12-09 14:30:49 -08:00
Brian Goff 243a640d3e Add test for exec tty stdin close 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-12-09 14:30:49 -08:00
Alexander Morozov 2687287289 Merge pull request #9575 from brahmaroutu/lxcconf_9501 
User should get error message on wrong config
 2014-12-09 14:10:38 -08:00
Srini Brahmaroutu 8dcbd6ab63 User should get error message on wrong config 
closes #9501

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2014-12-09 21:52:07 +00:00
Michael Crosby bb24f99d74 Merge pull request #9356 from cc272309126/fix-exec-paused-container 
Fix the issue that when docker exec a paused container, it will always
 2014-12-09 11:01:44 -08:00
Michael Crosby 64ebffe7b6 Merge pull request #9467 from icecrime/9401-restrict_add_chown_scope 
Reduce permissions changes scope after ADD/COPY
 2014-12-09 10:40:23 -08:00
Michael Crosby 86efd1a102 Merge pull request #9447 from ashahab-altiscale/7687-lxc-cap-add-cap-drop 
LXC CAP ADD CAP DROP IN TEMPLATE
 2014-12-09 10:35:52 -08:00
Tianon Gravi ca2ebaeafe Merge pull request #9581 from vbatts/vbatts-fix_gh9138 
contrib: fix the docker-device-tool
 2014-12-09 09:30:37 -08:00
shishir-a412ed 2597bffe9a Added description for 'docker run' command, -c/--cpu-shares flag 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2014-12-09 09:55:56 -05:00
James Turnbull c587a3faf6 Merge pull request #9558 from philips/fixup-typo-in-systemd-article 
docs: docker.service not services
 2014-12-09 23:10:17 +11:00
James Turnbull 74b29e8b45 Merge pull request #9559 from philips/use-dropins-in-systemd-article 
docs: use systemd drop-ins instead of copying
 2014-12-09 23:09:52 +11:00
unclejack f568b282fe Merge pull request #9573 from crosbymichael/flush-stdin 
Flush stdin from within chroot archive
 2014-12-09 01:54:01 +02:00
Fred Lifton 03d1622ab8 Merge pull request #9522 from SvenDowideit/add-some-cap-add-examples 
Add some cap add examples
 2014-12-08 15:50:25 -08:00
Michael Crosby d1535131d2 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>
 2014-12-08 15:41:07 -08:00
Tibor Vass c9285a08b1 Merge pull request #9539 from flynn/chroot-untar-empty-archive-slow 
Fix chroot untar for zero padded archive from slow reader
 2014-12-08 17:59:21 -05:00
Alexander Morozov 0d94196999 Merge pull request #9567 from jfrazelle/8333-net-link-error 
Throw error when container links to --net host container
 2014-12-08 14:36:44 -08:00