fbccc581db
integration: Fix TestGetContainersExport
...
The tar changes made the name of the file in the tar archive
change from "./test" to "test", update the test to the new name.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: bde2d3aef7715814920a07d2c5e08d14eabe3e53
Component: engine
2014-01-21 10:41:08 +01:00
e14eb95c77
hack: Remove GNU Tar requirement
...
We no longer call out to tar, so this is not needed.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 8a4824d1ad2fafd158fbaad52a658c5fd3f7de30
Component: engine
2014-01-20 20:35:16 +01:00
f075178b2b
Implement TarFilter in go, rather than calling out to tar
...
This uses a plain filepath.Walk + addTarFile to create a tar file,
optionially compressing it with gzip.
Unfortunately go only has gzip compression support, not bzip2 or xz.
However, this is not a regression, as docker currently uses *no*
compression for TarFilter(). The only compression of tarfiles
currently happens in utils/tarsum.go, and that manually does gzip
compression.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 5ea48aa7f8d3839877b869fdfcea2d5de0972fbf
Component: engine
2014-01-20 20:26:20 +01:00
2a219597ed
Simplify addTarFile
...
We can use tar.FileInfoHeader to do much of the work.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: bab8efbf050e1bc2d5c2ff64c6161ef4d323bc3f
Component: engine
2014-01-20 20:26:20 +01:00
0762ca65d0
archive: Extract code from ExportChanges to addTarFile()
...
This is the code that takes a normal file and adds it to a TarWriter.
We extract it so that we can share it with Tar().
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 5b77e51e0a15eddefcb40380673df8c0c24f95d1
Component: engine
2014-01-20 20:26:20 +01:00
e8d9d10625
archive: Remove unused features
...
This simplifies that code that calls out to tar by removing support
for now unused features.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 4fb1db7f742fb34a7a06621d0698063de87a572c
Component: engine
2014-01-20 20:26:20 +01:00
c45dd55039
Merge pull request #3665 from vgeta/3450-fix
...
Fixes Issue #3450
Upstream-commit: 69be8adb6830f8631f7fd35ebed6783963c79b28
Component: engine
2014-01-20 11:10:54 -08:00
d4c3241336
Merge pull request #3292 from alexlarsson/export-changes-manual
...
Don't shell out to tar for ExportChanges
Upstream-commit: b563c0c02b563d72f32a4e4c6fac5aaba34bc287
Component: engine
2014-01-20 11:08:16 -08:00
ca8c167948
Merge pull request #3680 from pnasrat/extract-mount-pkg
...
Extract mount into pkg.
Upstream-commit: 0f0e5824903ccaa543eb1126d5da655e5f6c878d
Component: engine
2014-01-20 11:04:16 -08:00
20e6d0be01
Extract mount into pkg.
...
Mount is self contained and generic, it should be in pkg, to allow other pkg modules to use it.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
Upstream-commit: 2e094db6390dde57263c07665290b1477bb6df7e
Component: engine
2014-01-20 13:59:29 -05:00
a169b77a82
Merge pull request #3295 from alexlarsson/implement-untar
...
Implement UnTar via archive/tar
Upstream-commit: 3aa27eb055f75d6e92bf4860f632aee61c2b3f87
Component: engine
2014-01-20 10:54:42 -08:00
760a549e35
Merge pull request #3678 from creack/sysinfo_update
...
Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
Upstream-commit: a431f1703d709043f070fd6bbb8aaba24de2efb8
Component: engine
2014-01-20 10:39:37 -08:00
834c1cb5f1
Merge pull request #3649 from vieux/remove_buffers
...
refactor, remove useless buffers
Upstream-commit: f87a67a3a85189756ece90cd7ac5eef2c0ad51a8
Component: engine
2014-01-20 10:29:54 -08:00
e1a1963ce9
Update Travis to also test compiling the docs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fe02d589272e61f75c9e794afb82641e78dfe8a3
Component: engine
2014-01-20 11:24:38 -07:00
f7349c8f1e
Merge pull request #3652 from tianon/fix-travis-on-non-master-prs
...
Fix Travis for PRs against non-master (like release, for example)
Upstream-commit: 3bd36157a10bbbe8fbdca14aefb03496a225e0be
Component: engine
2014-01-20 10:21:50 -08:00
642babd6eb
Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: ff662446f774d573442baa526263544df2570ebf
Component: engine
2014-01-20 10:20:29 -08:00
98435ab7c4
Switch docker run --username to docker run --user which is more accurate (while we can still do so without breaking anyone's scripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fb981bdace66e5b34d41125beb16e450998fd1e7
Component: engine
2014-01-20 00:28:55 -07:00
38cccce275
Resync bash completion to include all flags defined in the code, and to autocomplete properly on all parameters that are reasonably possible to do so on today
...
This also includes several new minor features that are interesting, so do explore a little. :)
Finally, this also fixes a few bugs where commands would complete parameters that they won't necessarily accept. We still have a few of these cases, but they're reduced to a minimum now.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c6e43154f186c9fac8501016473b459db3130222
Component: engine
2014-01-20 00:28:55 -07:00
fc1cb79689
Fixes Issue# 3450
...
Docker-DCO-1.1-Signed-off-by: Gopikannan Venugopalsamy <gopikannan.venugopalsamy@gmail.com > (github: vgeta)
Upstream-commit: e45b87031c2b68ebbf98fdc02bace53ebe932148
Component: engine
2014-01-19 17:48:54 -08:00
24ba808848
Merge pull request #3256 from alexlarsson/blkdiscard
...
Discard all data on devicemapper devices when deleting them
Upstream-commit: a60f0a07542b923f81adef2b56621a1eb712d008
Component: engine
2014-01-18 10:12:10 -08:00
068067c588
Fix Travis for PRs against non-master (like release, for example)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 980e0bf52c15bdf179c58b2d4f1085e26f8a3e2a
Component: engine
2014-01-18 10:41:37 -07:00
4100795860
refactor, remove useless buffers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 455495f7caf1bf2ff9ea1364bbf2362d9737b54c
Component: engine
2014-01-17 18:54:02 -08:00
83cca3f4a4
Merge pull request #3638 from tianon/update-mailmap-authors
...
Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!
Upstream-commit: dc359e07d3d48202c7fe6168bd6cf5ab5b2725e9
Component: engine
2014-01-17 18:19:41 -08:00
ce11258e8e
Fix rebase for init error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d5112ffce60625e470515578ccd446a191dd9e88
Component: engine
2014-01-17 17:42:58 -08:00
95062bc2c2
Add todos for driver changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5c30c4379af20b3cbd2d20cc9f0ccb6f04ac63ab
Component: engine
2014-01-17 17:42:58 -08:00
96611d5300
Make sure drivers are registerd within sysinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 97c84507054a7379c8f8b461773b9c8d4972902b
Component: engine
2014-01-17 17:42:58 -08:00
3a041a0663
Change drvier name to append version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cdfebc2a20e76d4ea81eb154b748e0547a7e7ab5
Component: engine
2014-01-17 17:42:58 -08:00
8771a3eaee
Move lxc template into lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 70a5cb95b31c7596886b7f94d292444654b9af8d
Component: engine
2014-01-17 17:42:58 -08:00
72a4c2e064
Rename Capabilities in sysinfo and move it to its own subpackage
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
Upstream-commit: 9e9f4b925b4b6a58a03bbff09150f1314d5fe3b2
Component: engine
2014-01-17 17:42:58 -08:00
d65bec8d4a
Small fixes to type names
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ca8dd73fbfa7aca0768278ff1ff9671f80c48138
Component: engine
2014-01-17 17:42:22 -08:00
ae872300fb
Cleanup + add Info to driver in order to have specific IsRunning()
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
Upstream-commit: 889b4b10ae3ec1d6e7879c30860aafd7674cb576
Component: engine
2014-01-17 17:42:22 -08:00
ab79ba703f
Move docker init into drivers functions
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
Upstream-commit: f7684ea7f61c0c69033c27605e9ad9a0a76e74cd
Component: engine
2014-01-17 17:42:22 -08:00
99f003c9e7
Make sure proc is umounted for chroot driver within init
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d3bae131d6fa10dd1c25077204bf2c3274a3b8cc
Component: engine
2014-01-17 17:42:22 -08:00
ecb354d61e
Improve wait for lxc and driver interface
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8c9f62d037a1bc82742ea316adaaf658af56b7c3
Component: engine
2014-01-17 17:42:22 -08:00
61d0d163e4
Use utils.Go to get error from monitor
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c2b602b2ac7b5b3a67dbb7945e97a9f48b1a625e
Component: engine
2014-01-17 17:42:22 -08:00
749c5a2471
Add json tags and comments to exedriver types
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e765c67b477308643c8b1b4f84bee3572bf5ec98
Component: engine
2014-01-17 17:42:22 -08:00
016a7317fc
Simplify chroot wait, address code review issues
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f3f2456b0451d93a539eac63dac93a748e01317f
Component: engine
2014-01-17 17:42:22 -08:00
1e6d4ad1dd
Move setup pty and standard pipes to funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8a38ead21993dd500280ae427895363a2de8be8a
Component: engine
2014-01-17 17:42:22 -08:00
b7aec1007b
Remove SysinitPath from process
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1e81387edcab600c9b8bc2a502988f7b3a2013e7
Component: engine
2014-01-17 17:42:22 -08:00
28c45914a4
Make exec driver run a blocking command
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f846ecdc77bb9ab4d44b41a2e403bcf579d6b6e9
Component: engine
2014-01-17 17:42:22 -08:00
653b7f7ad7
Improve chroot driver by mounting proc
...
Add -driver flag to dockerinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 92e6db7beba8ad58e425119cc9885c355a5755e7
Component: engine
2014-01-17 17:42:22 -08:00
98268ad2c1
Add chroot driver for testing
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8e0741f5e40d107780a5be1f6ae0f4d30ba43d7d
Component: engine
2014-01-17 17:42:22 -08:00
9b96c8681d
Move RootIsShared to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1d8455e6838f2630221eb3fcafeb382f9f7ce260
Component: engine
2014-01-17 17:42:22 -08:00
695537a626
Update with lxc unconfined changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 93ead2fe789a3a94a8433b12efcca782e0a7d7de
Component: engine
2014-01-17 17:42:22 -08:00
ecb0de6cea
Fix network disabled for container
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 66782730b85db20600ce48fcab203a5eb43bcb02
Component: engine
2014-01-17 17:42:22 -08:00
f7fe9669ce
Fix race in set running
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 77936ba1a1ff404b75ae8a34c6d4e280c23d9144
Component: engine
2014-01-17 17:42:22 -08:00
2e99b888c2
Fix race in cleanup
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 381d593d04fc46dac5b202d047981e15183c5ed1
Component: engine
2014-01-17 17:42:22 -08:00
1e4d16ab41
Fix race in TestRun
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ad9710685ca3ae101c84a57c7d68a25cba4bede2
Component: engine
2014-01-17 17:42:22 -08:00
8eebe6db05
Update with container specific waitLock
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8b60273f76723897a9831ca125500ede85e05b5d
Component: engine
2014-01-17 17:42:22 -08:00
a8716549d6
Rework monitor and waitlock inside of driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8e87835968a4c6233406061759e3dca03ab86989
Component: engine
2014-01-17 17:42:22 -08:00
