3044e71de0
Merge pull request #3841 from alexlarsson/separate-base-fs
...
Separate out graphdriver mount and container root
Upstream-commit: 53ee1daa699ab28fdd37d77b2cfbb0fc14dc0fdb
Component: engine
2014-01-31 11:49:14 -08:00
4ca789745b
Merge pull request #3829 from vieux/fix_api_regression
...
Fix ID -> Id api
Upstream-commit: 643c7dc25df4759c1894ba2ff3aa71fe11a06ea4
Component: engine
2014-01-31 10:38:57 -08:00
d1aba4a6ea
Remove api_params.go
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 2b52d6e801dd888e1f5759448da025e0ddcffedd
Component: engine
2014-01-31 03:59:14 +00:00
6d81dd5d9b
Separate out graphdriver mount and container root
...
This separates out the directory as returned from the graphdriver (the
"base" fs) from the root filesystem of the live container. This is
necessary as the "diff" operation needs access to the base filesystem
without all the mounts that the running container needs (/.dockerinit,
volumes, etc).
We change container in the following way:
Container.RootfsPath() returns the the directory which will be used as
the root in a running container. It is always of the form
"/var/lib/docker/container/<id>/root" and is a private bind mount to
the base filesystem. It is only available while the container is running.
Container.BasefsPath() returns the raw directory from the graph driver
without the container runtime mounts. It is availible whenever the
container is mounted (in between a container.Mount()/Unmount() pair,
which are properly refcounted).
This fixes issue #3840
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: fab19d197c6cc362182f6cee4d0a6e65e799875f
Component: engine
2014-01-30 16:43:53 +01:00
5eea23ed5b
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5b82a1b726291d4aaaad797df5b29a74de28d318
Component: engine
2014-01-30 00:55:29 +00:00
af8535454e
fix ID -> Id api
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 54072dbbd6260a9d8a7249cae0bd17513f15c3fc
Component: engine
2014-01-29 20:31:49 +00:00
80cd671c19
Improve test for container list ps
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
Upstream-commit: 1ee1dc2340ef030fc3ed132ff51d196536b46600
Component: engine
2014-01-26 23:14:50 +00:00
b7a9dba025
Move containers to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5ea2986ce5cfce1b86fdc92610dbc6d670691168
Component: engine
2014-01-24 16:07:42 -08:00
32ee8c9560
fix error handling
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f41e0cf0485eac21d65c1af19a732b350292d200
Component: engine
2014-01-24 14:59:46 -08:00
4dfa12a504
Move docker rmi to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 564e6bc7802b606d829a498eee0c2bb8ce4032e1
Component: engine
2014-01-24 14:55:11 -08:00
10c689f549
move pull and import to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 9dcbdbc4b1addb67c0fdcadab1c8f98f30e58b4c
Component: engine
2014-01-24 14:46:31 -08:00
31fb352a08
Merge pull request #3558 from tianon/buildfile-run-json
...
Add support for RUN [""] in Dockerfiles
Upstream-commit: 2a6e93a6fb9870cd2c2e1942afcdea5f154f1715
Component: engine
2014-01-22 11:51:34 -08:00
47913f96e1
Merge pull request #3073 from alexlarsson/refcount-driver-mounts
...
Refcount driver mounts
Upstream-commit: f61a91f50a753e0b8878675b4bab8ee4dc2a70e1
Component: engine
2014-01-22 11:42:17 -08:00
f98385a1b6
Merge pull request #3712 from plietar/kill-signal
...
Add a -s option to the kill command to specify a signal.
Upstream-commit: 44a0bab30488f2d6084feaf34389ac305b53ae8d
Component: engine
2014-01-22 11:38:16 -08:00
78636fd4dc
Merge pull request #3682 from alexlarsson/implement-tar
...
Implement tar in Go
Upstream-commit: 639d2ecd4f7a86a34bdde890002129f0b22c85fa
Component: engine
2014-01-22 11:23:47 -08:00
04f201ccfb
Add a --signal option to the kill command to specify a signal.
...
Docker-DCO-1.1-Signed-off-by: Paul Lietar <paul@lietar.net > (github: plietar)
Upstream-commit: 1f75a0bf435fe9a0f118b027e0387ba41e201c66
Component: engine
2014-01-22 06:10:52 +00:00
5bf17309b9
Merge pull request #3706 from creack/fix_wait_stopped
...
Fix wait on stopped container (after docker restart) + add Unit test for that case
Upstream-commit: 0b789ca84480731ae275569282a8be2e68616196
Component: engine
2014-01-21 17:03:35 -08:00
f30d57c548
Fix wait on stopped container (after docker restart) + add Unit test for that case
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 0376a69cb1cc839f7e1a147623b399147a5976c9
Component: engine
2014-01-21 16:49:24 -08:00
2a860faf85
switch back to the valid json format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e3461bc8d694fa4b104a9cdd08e11de26a04d923
Component: engine
2014-01-21 15:06:23 -08:00
36def61b75
Remove container.EnsureMounted
...
This was deprecated already and all it did was call Mount().
The use of this was a bit confusing since we need to pair Mount/Unmount
calls which wasn't obvious with "EnsureMounted".
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 191aa17d16c0935a7deda03b4c3bc879f7a316eb
Component: engine
2014-01-21 11:26:11 +01:00
5e35604785
Add Put() to graphdriver API and use it
...
This makes all users of Put() have a corresponding call
to Get() which means we will be able to track whether
any particular ID is in use and if not unmount it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: bcaf6c2359d83acd5da54f499e21f4a148f491c5
Component: engine
2014-01-21 11:25:37 +01:00
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
145ef0e1f4
Fix support for registry auth with Dockerfile build.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
Upstream-commit: 6e6ff85362dfa823c392392cb9e70d620e308911
Component: engine
2014-01-20 18:35:14 -05: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
ec9f60e58d
move changes to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 90ec5de430a79ab6b145899a9842c1db968341cf
Component: engine
2014-01-15 17:13:45 -08:00
42a6830aeb
move insert to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 0fb8a55753269603eb8f01f725675ceacae79c29
Component: engine
2014-01-15 14:52:58 -08:00
708fd3d625
fix tests & small code improvment
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 7898dca8b3d1835d15812bd5249fcfb0de73257b
Component: engine
2014-01-15 11:06:00 -08:00
1ccf04f8d4
Add compat 1.8
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 3a610f754f425ea6042c3f8b5452273656a06c90
Component: engine
2014-01-13 15:50:20 -08:00
5f902c5a09
Port 'docker images' to the engine API
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 17a806c8a0b6add2aa773dfca272acefee9b638c
Component: engine
2014-01-13 15:49:33 -08:00
f19f8cb54e
Add support for RUN [""] in Dockerfiles for greater specificity in what is actually executed
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fd78128870b78c282b65976cfff100c4101569b1
Component: engine
2014-01-11 04:00:52 -07:00
d1d0fdf0a6
Merge pull request #3180 from vieux/job_container_delete
...
Move container_delete to job
Upstream-commit: 6dde20c0c517833224689c0eff2d247910a7083b
Component: engine
2014-01-10 15:53:38 -08:00
bf5f5a9318
Merge pull request #3476 from vieux/restart_job
...
Move restart to a job
Upstream-commit: ad162b75a06a796d404a3e6d8fb728f0788dc399
Component: engine
2014-01-10 15:52:42 -08:00
aee266dfbc
Move restart to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 15689b56c8e397d3207dad5b23937cb9b1e453cd
Component: engine
2014-01-10 15:51:48 -08:00
cf41511c88
move container_delete to job
...
handle error
remove useless errStr
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com > (github: vieux)
Upstream-commit: aa3339cf39b88e4a4b3d830d9b0831d4abff1dcb
Component: engine
2014-01-10 15:34:10 -08:00
454544f252
Merge pull request #3510 from creack/hotfix-add_caching
...
Hotfix add caching
Upstream-commit: 772765c404e13e3b7225ab1c3263aa208404b44e
Component: engine
2014-01-08 15:00:18 -08:00
ffd759db06
Potential fix for ADD .
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 93ff70a3e70e14762314f04e2b9f61c8710d5353
Component: engine
2014-01-08 14:22:24 -08:00
70ceedcf64
Fix for #3345 : Add Content-Type Header "application/json" to GET /version and /info responses in remote API
...
Docker-DCO-1.0-Signed-off-by: Manuel Woelker <github@manuel.woelker.org > (github: manuel-woelker)
Upstream-commit: 53a01aebd61e8db34c9106f5b2c5fdad6909caee
Component: engine
2014-01-08 09:17:20 +01:00
6560fa5daf
Merge pull request #3474 from creack/fix_add_cache_issue
...
Fix ADD caching issue with . prefixed path
Upstream-commit: bb76985d39112fc07e64334704702a90d0bea8f1
Component: engine
2014-01-07 17:24:18 -08:00
b0481e14ce
Fix issue with file caching + prevent wrong cache hit
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: f3103e5c9157aed2a5ab0f4c70e328cd0aa69b59
Component: engine
2014-01-07 16:53:55 -08:00
45fc411688
Fix ADD caching issue with . prefixed path
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <charmes.guillaume@gmail.com > (github: creack)
Upstream-commit: 811341423bd9d3d65640cb4aa04d2840817182ca
Component: engine
2014-01-07 16:02:20 -08:00
d5d32a285c
Move utility package 'iptables' to pkg/iptables
...
Upstream-commit: 7799ae27ca1dd85761f0595346a0dda15bbeda6c
Component: engine
2014-01-06 15:41:24 -08:00
563b24676d
Merge pull request #3388 from tianon/more-build-tests
...
Add more TestBuild Dockerfiles, especially for 'echo shebang' testing
Upstream-commit: bb754fd34d380fd59f87f6d198361c9ba7239e10
Component: engine
2014-01-06 15:14:30 -08:00
81433035f2
Use same error handling while unmarshalling args for CMD and ENTRYPOINT
...
Upstream-commit: 323c4b5211ecef4cffcbe0a97811ddd93c469164
Component: engine
2014-01-06 13:15:14 -05:00
98a0b9e86f
Add more TestBuild Dockerfiles, especially for making sure manual RUN echo '#!...' continues to work correctly
...
Upstream-commit: c6dcee329dc9e720d70d9534c261fe9e9cf80512
Component: engine
2013-12-30 00:10:48 -07:00
e297baa1c0
Merge pull request #2809 from graydon/880-cache-ADD-commands-in-dockerfiles
...
Issue #880 - cache ADD commands in dockerfiles
Upstream-commit: efaf2cac5c8d54a5098f7036e738e1f919f84452
Component: engine
2013-12-24 16:22:51 -08:00
53605d721c
Merge pull request #3330 from shykes/pkg-term
...
Move utility package 'term' to pkg/term
Upstream-commit: e6e35e598426d82b43200112269005cdffbbfdc0
Component: engine
2013-12-23 16:11:42 -08:00
a481c1b450
Move utility package 'term' to pkg/term
...
Upstream-commit: 7ce7516c12f58aa71cd055b7c0bef6585d3f2ab3
Component: engine
2013-12-23 23:42:37 +00:00
a0bbcd5fb8
discard test output
...
Upstream-commit: 369cde4ad7b2618e24294839761b743c5c25911b
Component: engine
2013-12-20 16:50:31 -08:00
b58bf0fa05
add TestContainerOrphaning integration test
...
Upstream-commit: c995c9bb91a2bf5b2038330d063a073d2e0c611c
Component: engine
2013-12-20 16:52:34 -07:00
fd15c72b59
Merge pull request #3289 from crosbymichael/add-mtu-option
...
Allow mtu to be configured at daemon start
Upstream-commit: aa619de748e2337f6bb7aac62c212811ac709c1e
Component: engine
2013-12-20 13:21:56 -08:00
