Commit Graph

65 Commits

Author SHA1 Message Date
Michael Crosby 07887f65de Revert "remove hack in version"
This reverts commit b2b9334f27.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-04 11:38:03 -07:00
Michael Crosby 09aa28eca0 Merge pull request #5005 from shykes/deprecate-insert
Deprecate 'docker insert'
2014-04-03 17:16:25 -07:00
Victor Vieux b2b9334f27 remove hack in version
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-04-04 00:08:51 +00:00
Solomon Hykes 615ac8feb2 Deprecate 'docker insert'
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.

This removes the command from usage and documentation, and prints a
warning when it is called.

The command still works but it will be removed in a future version.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-04-03 23:52:09 +00:00
Guillaume J. Charmes cd910cb685
Allow force sigint and allow sigquit after sigint
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-04-03 10:07:42 -07:00
Guillaume J. Charmes 3b3f4bf052
Return correct exit code upon signal + SIGQUIT now quits without cleanup
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-04-02 05:56:11 -07:00
Michael Crosby 9cc7eb4ab3 Merge pull request #3971 from creack/fix_add_ownership
Change ownership to root for ADD file/directory
2014-04-02 12:22:09 -07:00
Victor Vieux d7ec39a4cf <3
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-04-02 01:19:26 +00:00
Guillaume J. Charmes b246fc33ae
Add API version to `docker version`
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-04-01 17:30:19 -07:00
Guillaume J. Charmes 026aebdebb
Change ownership to root for ADD file/directory
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-04-01 14:17:31 -07:00
Michael Crosby 3178723341 Merge pull request #4956 from tianon/sig
Simplify the kill "SIG" prefix stripping code
2014-04-01 13:10:16 -07:00
Victor Vieux e175a55eb9 Merge pull request #4948 from creack/push_single_tag
Allow push of a single tag
2014-04-01 12:54:15 -07:00
Tianon Gravi 4bf70317ed Simplify the kill "SIG" prefix stripping code
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-01 13:33:46 -06:00
Michael Crosby 7ab66fa694 Merge pull request #4947 from tianon/sig
Allow "SIG" prefix on signal names in `docker kill` ("SIGKILL", etc)
2014-04-01 11:59:44 -07:00
Guillaume J. Charmes cff5f0357e
Minor cleanup
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-04-01 10:27:05 -07:00
Tianon Gravi 4cb602afa0 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)
2014-04-01 11:01:07 -06:00
Michael Crosby ac9b06ae95 Update sig message
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-01 08:18:52 +00:00
Guillaume J. Charmes e648a186d6
Allow push of a single tag
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-31 18:50:10 -07:00
unclejack 5b9c8607d9 Merge pull request #4759 from crosbymichael/comments-in-buildfile
Strip comments before parsing line continuations
2014-03-28 11:16:32 +02:00
Michael Crosby 67af7b3fb0 Strip comments before parsing line continuations
Fixes #3898
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-27 02:41:08 +00:00
Michael Crosby 0fb01fd8fe Follow symlinks inside container root for build's ADD
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-27 02:07:35 +00:00
LK4D4 c7540b3e94 Workaround for hanging events. Fixes #4804
Docker-DCO-1.1-Signed-off-by: LK4D4 <lk4d4math@gmail.com> (github: LK4D4)
2014-03-24 22:31:32 +04:00
Vincent Batts 367a679b92 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)
2014-03-19 14:34:12 -04:00
Michael Crosby 47470d299d Merge pull request #4691 from tianon/relative-workdir
Add proper support for relative WORKDIR instructions
2014-03-19 09:57:23 -07:00
LK4D4 c1f2abd899 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)
2014-03-18 23:30:21 +04:00
Guillaume J. Charmes 68dc189680 Merge pull request #4661 from vieux/add_no_prune
Add no prune
2014-03-17 16:07:55 -07:00
Victor Vieux edd8d2d351 add no prune to rmi
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-17 18:40:57 +00:00
Victor Vieux 5921b186d1 display command display in docker ps
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-17 18:36:15 +00:00
Tianon Gravi 054b85a7b2 Add proper support for relative WORKDIR instructions
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-15 14:03:16 -06:00
Michael Crosby 5239aa1f11 Move server and buildfile into server pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-14 09:37:08 -07:00
Solomon Hykes 745edc49cd 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 2013-03-13 00:29:40 -07:00
Solomon Hykes 070bc0bb6d Merged version option by @kencochrane 2013-03-12 20:59:47 -07:00
Ken Cochrane e20a74d247 fixed formatting issue 2013-03-12 17:34:15 -07:00
Solomon Hykes 46dce5918a Merge pull request #48 from dotcloud/memorylimits
Memorylimits
2013-03-12 12:02:49 -07:00
creack 453d49573c Put back the github.com path for the import 2013-03-12 11:59:27 -07:00
creack d91d0da453 Fix merge issue 2013-03-12 08:59:32 -07:00
creack 150a4fe7e5 Merge master within fs 2013-03-12 08:33:21 -07:00
Guillaume J. Charmes d24ce7dfd1 Merge branch 'fs' of https://github.com/dotcloud/docker into fs 2013-03-12 05:37:07 -07:00
shin- de50c9c4e8 'docker run' works with paths as well as image IDs 2013-03-12 05:57:19 -07:00
Guillaume J. Charmes 45a8bba15e gofmt 2013-03-12 05:36:37 -07:00
Guillaume J. Charmes 18f4e7e196 Put back the relative paths for dev purpose 2013-03-12 05:17:51 -07:00
shin- 8158616d61 Merge branch 'fs' of github.com:dotcloud/docker into fs 2013-03-12 04:29:06 -07:00
shin- 63dd8f1018 Re-enabled cat, write and ls ; Added creation date to image metadata 2013-03-12 04:24:26 -07:00
Solomon Hykes 132ecb2482 Replaced 'pull' and 'put' with 'import' 2013-03-11 21:04:16 -07:00
Sam Alba 3684b67572 Added -m to the run command in order to set a memory limit to a container 2013-03-11 19:51:24 -07:00
Charles Hooper 52b811f50a Add all commands to the output of 'dotcloud help'. Fixes #39 2013-03-11 23:11:46 +00:00
Charles Hooper a7cb3cb86a Complete fix for #38 -- fix double-usage on help 2013-03-11 22:29:13 +00:00
Charles Hooper 06d420d2ea Fix CmdInspect and CmdImages help/parsing. Fixes #38 2013-03-11 22:08:22 +00:00
shin- 5d6199b925 post-merge repairs 2013-03-11 07:39:06 -07:00
shin- 97a8209438 Merged master branch into fs 2013-03-11 05:42:36 -07:00