Commit Graph

3720 Commits

Author SHA1 Message Date
Guillaume J. Charmes d42c10aa09 Implement Context within docker build (not yet in use) 2013-05-23 18:32:56 -07:00
Guillaume J. Charmes ecb64be6a8 Merge pull request #695 from dtzWill/694-fix-merge-config
- Runtime: utils.go: Fix merge logic for user and hostname.
2013-05-23 16:00:34 -07:00
Will Dietz 83bc5b7435 utils.go: Fix merge logic for user and hostname.
Fall back to image-specified hostname if user doesn't
provide one, instead of only using image-specified
hostname if the user *does* try to set one.
(ditto for username)

Closes #694.
2013-05-23 15:54:51 -05:00
Guillaume J. Charmes 822056094a Bumped version to 0.3.3 2013-05-23 12:46:14 -07:00
Daniel Mizyrycki d17c0b8368 Packaging: Update changelog for release 0.3.3 2013-05-23 12:45:00 -07:00
Solomon Hykes e0e385ac69 * Build: leave temporary containers untouched after a failure to help debugging 2013-05-23 11:12:54 -06:00
Solomon Hykes 66f3a96983 * Remote API: add versioning 2013-05-23 10:44:36 -06:00
Victor Vieux 31c98bdaaf bring Error: Command not found: <command>
Usage: docker COMMAND [arg...]

A self-sufficient runtime for linux containers.

Commands:
    attach    Attach to a running container
    insert    Insert a file in an image
    login     Register or Login to the docker registry server
    export    Stream the contents of a container as a tar archive
    diff      Inspect changes on a container's filesystem
    logs      Fetch the logs of a container
    pull      Pull an image or a repository from the docker registry server
    restart   Restart a running container
    build     Build a container from Dockerfile or via stdin
    history   Show the history of an image
    kill      Kill a running container
    rmi       Remove an image
    start     Start a stopped container
    tag       Tag an image into a repository
    commit    Create a new image from a container's changes
    import    Create a new filesystem image from the contents of a tarball
    ps        List containers
    rm        Remove a container
    run       Run a command in a new container
    wait      Block until a container stops, then print its exit code
    images    List images
    port      Lookup the public-facing port which is NAT-ed to PRIVATE_PORT
    info      Display system-wide information
    inspect   Return low-level information on a container
    push      Push an image or a repository to the docker registry server
    search    Search for an image in the docker index
    stop      Stop a running container
    version   Show the docker version information back
2013-05-23 16:32:39 +00:00
Victor Vieux 59835135c5 added warning 2013-05-23 16:15:36 +00:00
Victor Vieux 13f1939a63 switch to default 127.0.0.1, and mixed the two flags in one. -h 2013-05-23 16:09:28 +00:00
Solomon Hykes dbb7b60cfc Re-ordered and re-titled kernel requirement details to match the shortlist 2013-05-23 09:49:53 -06:00
Solomon Hykes e77263010c Simplified and clarified kernel install instructions 2013-05-23 09:47:20 -06:00
Solomon Hykes 2cf29893b3 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-23 09:33:34 -06:00
Solomon Hykes 5f30453bfe Merge pull request #688 from pxlpnk/patch-1
Fixing two typos in the run help
2013-05-23 08:21:05 -07:00
Victor Vieux cf35e8ed81 jsonstream WIP 2013-05-23 15:16:35 +00:00
Andreas Tiefenthaler 9e0427081e Fixing two typos in the run help 2013-05-23 18:09:59 +03:00
Solomon Hykes bc3675d471 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-23 09:01:40 -06:00
Victor Vieux b45143da9b switch to SI standard and add test 2013-05-23 10:29:09 +00:00
Victor Vieux ed56b6a905 fix typo 2013-05-23 09:35:20 +00:00
Guillaume J. Charmes 0f135ad7f3 Start moving the docker builder into the server 2013-05-22 20:07:26 -07:00
Thatcher 422edd513a Merge pull request #683 from rogaha/doc_meta_info_update
Looks good. Thanks!  Closes #637
2013-05-22 19:09:32 -07:00
rogaha 18cb5c9314 added/modifed tittle, description and keywords
changed the title prefix to sufix + Documentation
2013-05-22 17:52:48 -07:00
Thatcher 4d80924f7c Merge pull request #681 from dhrp/680-fix-readme-image
Fix broken image on README, closes #680
2013-05-22 16:09:21 -07:00
Thatcher Peskens f008d1107c Fix broken image on README, closes #680 2013-05-22 16:04:33 -07:00
Eric Hanchrow 056698b676 Use 127.0.0.1 instead of `hostname` in the "access the web app" section. 2013-05-22 12:54:50 -07:00
Eric Hanchrow b4198de6bf Merge remote-tracking branch 'upstream/master'
Conflicts:
	docs/sources/examples/python_web_app.rst
2013-05-22 12:52:14 -07:00
Victor Vieux 800b401f0b improved doc and usage 2013-05-22 16:15:52 +00:00
Victor Vieux faae7220c0 api versionning 2013-05-22 15:29:54 +00:00
Ken Cochrane 1ccc7bdd90 Merge pull request #668 from christophercurrie/patch-1
- Documentation: Fix typos in the python web app example docs.
2013-05-22 07:52:46 -07:00
Victor Vieux 52113cc443 Merge pull request #670 from dotcloud/669-wrong_content_type_create-fix
Fix content type in doc
2013-05-22 06:54:39 -07:00
Victor Vieux 949a649cc2 fix content type in doc 2013-05-22 13:49:12 +00:00
Victor Vieux 6fce89e60b bump to master 2013-05-22 13:41:29 +00:00
Christopher Currie 5818813183 Apparent typos in the docs. 2013-05-21 21:45:27 -06:00
Victor Vieux 4489005cb2 add regexp check on repo's name 2013-05-21 12:53:05 +00:00
Victor Vieux a3ccec197e add -host and -port 2013-05-21 10:14:58 +00:00
Guillaume J. Charmes e6e13d6ade Merge pull request #658 from dotcloud/builder_client_doc
Builder client doc
2013-05-20 18:14:44 -07:00
Guillaume J. Charmes 3f22842542 Remove no longer needed tests 2013-05-20 17:54:54 -07:00
Guillaume J. Charmes 218812eb3c Update docker builder doc 2013-05-20 17:52:39 -07:00
Guillaume J. Charmes d37dea318e Merge pull request #653 from dotcloud/builder_client
* Builder: Move the Builder to the client
2013-05-20 17:50:17 -07:00
Guillaume J. Charmes 49505c599b Fix an issue trying to pull specific tag 2013-05-20 17:30:33 -07:00
Guillaume J. Charmes f35f084059 Use pointers for the object methods 2013-05-20 16:35:28 -07:00
Eric Hanchrow 3a9ef5f9bb Install curl; nix stray backslash; use proper IP address 2013-05-20 16:31:39 -07:00
Guillaume J. Charmes 0d2fb29537 Merge fix 2013-05-20 16:21:35 -07:00
Guillaume J. Charmes 13e687e579 Allow multiple syntaxes for CMD 2013-05-20 16:00:51 -07:00
Guillaume J. Charmes b06784b0dd Make docker client an interface 2013-05-20 16:00:16 -07:00
Guillaume J. Charmes d756ae4cb3 Tag all images after pulling them 2013-05-20 15:19:05 -07:00
Guillaume J. Charmes c6bc90d02d Isolate run() from commit 2013-05-20 15:02:32 -07:00
Guillaume J. Charmes b51303cddc Make sure to have a command to execute upon commit 2013-05-20 13:50:50 -07:00
Guillaume J. Charmes c2a14bb196 Add "Cmd" prefix to builder instructions 2013-05-20 12:09:15 -07:00
Victor Vieux 67b20f2c8c add check to see if the image isn't parent of another and add -f to force 2013-05-20 18:31:45 +00:00