e8ca8d4bc2
Merge pull request #3971 from creack/fix_add_ownership
...
Change ownership to root for ADD file/directory
Upstream-commit: 9cc7eb4ab37504477b2e56219cab95e65a3fbf40
Component: engine
2014-04-02 12:22:09 -07:00
b3b5319e85
<3
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: d7ec39a4cfbee7b68e0c7973fb629da6f54d873c
Component: engine
2014-04-02 01:19:26 +00:00
0423604572
Add API version to docker version
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: b246fc33ae4f05b5084fed8fc9f1034e36d87d78
Component: engine
2014-04-01 17:30:19 -07:00
9cddc561e1
Change ownership to root for ADD file/directory
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 026aebdebbaa05eab25134949ed5d5bda655ba67
Component: engine
2014-04-01 14:17:31 -07:00
9d14eab3c2
Merge pull request #4956 from tianon/sig
...
Simplify the kill "SIG" prefix stripping code
Upstream-commit: 31787233411ee1af9b396f72f0e4b41af6421690
Component: engine
2014-04-01 13:10:16 -07:00
91f0b97e4d
Merge pull request #4948 from creack/push_single_tag
...
Allow push of a single tag
Upstream-commit: e175a55eb9f0fe78d42559a716c7f69c707d7f87
Component: engine
2014-04-01 12:54:15 -07:00
d6578971c5
Simplify the kill "SIG" prefix stripping code
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 4bf70317ed3c2467f444eac9b7865b170da6366c
Component: engine
2014-04-01 13:33:46 -06:00
bf0258224f
Merge pull request #4947 from tianon/sig
...
Allow "SIG" prefix on signal names in `docker kill` ("SIGKILL", etc)
Upstream-commit: 7ab66fa694c4be384588cfc2e6c975d325977024
Component: engine
2014-04-01 11:59:44 -07:00
9f401b129b
Minor cleanup
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: cff5f0357ea35245ac906a0326863ac1f8c47c61
Component: engine
2014-04-01 10:27:05 -07:00
e80bf0c7c4
Allow "SIG" prefix on signal names in docker kill ("SIGKILL", etc)
...
This way, we can use both `docker kill -s INT some_container` and `docker kill -s SIGINT some_container` and both will do nice things for us. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 4cb602afa0a905ceb0cccf49fe142c1c7b62087b
Component: engine
2014-04-01 11:01:07 -06:00
2f00c385f1
Update sig message
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ac9b06ae95f1da8407934036ab1e4019a96a6b21
Component: engine
2014-04-01 08:18:52 +00:00
9ef93e6d75
Allow push of a single tag
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: e648a186d68dcb3ee0d6123b041c5aa66438cc89
Component: engine
2014-03-31 18:50:10 -07:00
8972e580e1
Merge pull request #4759 from crosbymichael/comments-in-buildfile
...
Strip comments before parsing line continuations
Upstream-commit: 5b9c8607d90c20282eb65b75112f09634bcba277
Component: engine
2014-03-28 11:16:32 +02:00
6fd95365ed
Strip comments before parsing line continuations
...
Fixes #3898
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 67af7b3fb0b5e40a435b434c57291cb2989275ce
Component: engine
2014-03-27 02:41:08 +00:00
1c550a00a4
Follow symlinks inside container root for build's ADD
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0fb01fd8fe376a3518b1050ab62f2b3370d62535
Component: engine
2014-03-27 02:07:35 +00:00
ec5934f5dd
Workaround for hanging events. Fixes #4804
...
Docker-DCO-1.1-Signed-off-by: LK4D4 <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c7540b3e94d7712b6b91ba80de0155f20156f3f3
Component: engine
2014-03-24 22:31:32 +04:00
9788027867
images: assurance and debug info on image layers
...
when pushing or saving layers, report sizes for validation. And ensure
that the files written are sync'ed.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 367a679b9270dd9ec6bd647998b6ffe594cfa6ab
Component: engine
2014-03-19 14:34:12 -04:00
b5c2e757ec
Merge pull request #4691 from tianon/relative-workdir
...
Add proper support for relative WORKDIR instructions
Upstream-commit: 47470d299da4ade08bad4338c4dba4ceffacdce7
Component: engine
2014-03-19 09:57:23 -07:00
5ac53676ce
Using names in docker ps --since-id/--before-id, resolves #3565
...
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c1f2abd89958a8731211ceb2885eed238a3bea8d
Component: engine
2014-03-18 23:30:21 +04:00
3865d7d383
Merge pull request #4661 from vieux/add_no_prune
...
Add no prune
Upstream-commit: 68dc1896804de92b8c39cfc6bd4f7c96d4abe09e
Component: engine
2014-03-17 16:07:55 -07:00
c7bbb9caec
add no prune to rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: edd8d2d3511b0b632149d1c1f2cfd2bad2df4679
Component: engine
2014-03-17 18:40:57 +00:00
cad533fcfe
display command display in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5921b186d17b172f205f3b0b6bda1f3a4e650d3f
Component: engine
2014-03-17 18:36:15 +00:00
2dba72a6f7
Add proper support for relative WORKDIR instructions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 054b85a7b25e46935c0d91f544aac69dc3497468
Component: engine
2014-03-15 14:03:16 -06:00
d7147519fc
Move server and buildfile into server pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5239aa1f11c32f3befc25fb2fa8a0ecf75ec4bf6
Component: engine
2014-03-14 09:37:08 -07:00
621d110d7f
Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon
...
Upstream-commit: 745edc49cdcf0dc02fe714b0772f146fc8a66d23
Component: engine
2013-03-13 00:29:40 -07:00
906eecfc45
Merged version option by @kencochrane
...
Upstream-commit: 070bc0bb6d316a2a023161a19cba667831a26698
Component: engine
2013-03-12 20:59:47 -07:00
9a8e1b4a6b
fixed formatting issue
...
Upstream-commit: e20a74d2477ea3feb7a9734c15b645d081dbebdf
Component: engine
2013-03-12 17:34:15 -07:00
0e7bc1161e
Merge pull request #48 from dotcloud/memorylimits
...
Memorylimits
Upstream-commit: 46dce5918aad5134305d6f1eb6357c822a59bbed
Component: engine
2013-03-12 12:02:49 -07:00
35529bba2c
Put back the github.com path for the import
...
Upstream-commit: 453d49573c91a1c49ffbc54d040145804e38d91e
Component: engine
2013-03-12 11:59:27 -07:00
a130f465ad
Fix merge issue
...
Upstream-commit: d91d0da45310a4ab8d6124b70a1f541352149bdc
Component: engine
2013-03-12 08:59:32 -07:00
d6cad8aba4
Merge master within fs
...
Upstream-commit: 150a4fe7e5aaa5d733130e22eac09cb36ffadd82
Component: engine
2013-03-12 08:33:21 -07:00
ee6bd4ea31
Merge branch 'fs' of https://github.com/dotcloud/docker into fs
...
Upstream-commit: d24ce7dfd15b049560f5d06d57c2b7e2c6a5d61a
Component: engine
2013-03-12 05:37:07 -07:00
422044f5c5
'docker run' works with paths as well as image IDs
...
Upstream-commit: de50c9c4e8d0276890cfb521e5b57da58cf470aa
Component: engine
2013-03-12 05:57:19 -07:00
22687838eb
gofmt
...
Upstream-commit: 45a8bba15e95b789c12a371036aa1ad42357dc08
Component: engine
2013-03-12 05:36:37 -07:00
b9140244d5
Put back the relative paths for dev purpose
...
Upstream-commit: 18f4e7e196eb894765094c1291e1a1f6599f4266
Component: engine
2013-03-12 05:17:51 -07:00
82c8224ed4
Merge branch 'fs' of github.com:dotcloud/docker into fs
...
Upstream-commit: 8158616d6133bbe71ad33b4a2be06664e038b8d0
Component: engine
2013-03-12 04:29:06 -07:00
e1030605a9
Re-enabled cat, write and ls ; Added creation date to image metadata
...
Upstream-commit: 63dd8f101816c1253ac8d05e10f4f8a4c80f296a
Component: engine
2013-03-12 04:24:26 -07:00
c1226e5612
Replaced 'pull' and 'put' with 'import'
...
Upstream-commit: 132ecb24822072c82718d47ac23da62a8ea774fc
Component: engine
2013-03-11 21:04:16 -07:00
bb9fd12cf7
Added -m to the run command in order to set a memory limit to a container
...
Upstream-commit: 3684b67572605de492abba041695bd80ef42bcb5
Component: engine
2013-03-11 19:51:24 -07:00
77f5ae75a2
Add all commands to the output of 'dotcloud help'. Fixes #39
...
Upstream-commit: 52b811f50a0906904d688e5fae8f32e1ada90f1a
Component: engine
2013-03-11 23:11:46 +00:00
3fc19b598b
Complete fix for #38 -- fix double-usage on help
...
Upstream-commit: a7cb3cb86a39f950a517b61e3a674e0cd080804f
Component: engine
2013-03-11 22:29:13 +00:00
dd314eeb8b
Fix CmdInspect and CmdImages help/parsing. Fixes #38
...
Upstream-commit: 06d420d2ead65cb5af760d7946d8844f568f4d65
Component: engine
2013-03-11 22:08:22 +00:00
3720d832c1
post-merge repairs
...
Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6
Component: engine
2013-03-11 07:39:06 -07:00
347532ed43
Merged master branch into fs
...
Upstream-commit: 97a8209438dcc60395b244c14f4efced583eb364
Component: engine
2013-03-11 05:42:36 -07:00
c28aedcbf3
Change relative paths to absolute
...
Upstream-commit: 687d6f25eeb8f4bc505dc9c6c0d9ea305c824e2d
Component: engine
2013-03-11 02:59:52 -07:00
44192a1329
Plugged in image store in front-end (some commands are deactivated right now, will progressively reintroduce them
...
Upstream-commit: 93ba6dd82bb62dbb9cac729cfa6626c469a87d00
Component: engine
2013-03-08 10:48:22 -08:00
35ee9964bb
docker port: lookup public-facing tcp ports for a container
...
Upstream-commit: 410ebe379dbf60d8fd75ba695e4e8036fdba6b65
Component: engine
2013-03-06 00:39:03 -08:00
c114400a94
docker rmi -r: remove all images matching a regexp
...
Upstream-commit: 74c88fdbc0180c276f75322066e7da2e3cd38f6d
Component: engine
2013-03-05 22:39:43 -08:00
b8e54f45cd
Re-enabled CmdPull progress bar code which had been temporarily disabled
...
Upstream-commit: 5675439b9100b40529b8eb87447231a2f5a01ad2
Component: engine
2013-02-28 16:30:31 -08:00
db9b80be91
Server: -p option to export TCP ports
...
Upstream-commit: f857fa0dddbf48b959b0876582027ebc46dc5e9e
Component: engine
2013-02-28 11:52:22 -08:00
