Commit Graph
1543 Commits
Author SHA1 Message Date
Andy Rothfusz 85e46e1ff2 Merge pull request #709 from dhrp/links-to-kernel-doc
Added links to @jpetazzo 's kernel article, cleaned puppet doc layout
Upstream-commit: 235ae9cd43bbdaba9ea75ecbff8cf2f902e70cb9
Component: engine
2013-05-28 12:07:46 -07:00
Mark McGranaghan 9a8934c1af Fix attach API docs.
Upstream-commit: 7d6ff7be129d70f0ff5c50a47d70a32a1e6274bc
Component: engine
2013-05-28 06:27:12 -07:00
Guillaume J. Charmes 57720219a1 Merge pull request #657 from offby1/master
Minor tweaks to python_web_app.rst
Upstream-commit: d3b9733507746b29e7f3da6f69bddf95f55d9582
Component: engine
2013-05-24 19:19:32 -07:00
Solomon Hykes fdc407078f * Registry: specified naming restrictions for usernames and repository names
Upstream-commit: df23a1e675c7e3cbad617374d85c48103541ee14
Component: engine
2013-05-24 18:58:24 -07:00
Solomon Hykes 0fb224b331 Fix a unit test broken by pull request #703
Upstream-commit: bb4b35a8920bcba8b60784297650ced5b2e01e47
Component: engine
2013-05-24 18:32:21 -07:00
Solomon Hykes 2b6649e390 Added FIXME about possible race condition in a unit test
Upstream-commit: 194f48774992644257bf7cf0878e47e9834d40e1
Component: engine
2013-05-24 18:31:47 -07:00
Solomon Hykes d6fea566f0 * Remote API: send push/pull progress bar as json
Upstream-commit: 9775f0bd145c607126ea22a17b291dea822be7b2
Component: engine
2013-05-24 17:59:27 -07:00
Guillaume J. Charmes fe4868dfd9 Fix merge issue
Upstream-commit: b438565609917439cb4172717e5505c265c4e291
Component: engine
2013-05-24 14:48:13 -07:00
Guillaume J. Charmes 8e3c67a46e Merge branch 'master' into tty_resize
Conflicts:
	commands.go
Upstream-commit: ffd9e06deb9d222ac5e1f63734211c0503213e06
Component: engine
2013-05-24 14:45:31 -07:00
Guillaume J. Charmes c479ea1a4b Finish resize implementation client and server
Upstream-commit: 88ef309a940bcbb6f85a750372b8fdbc6569c3a7
Component: engine
2013-05-24 14:44:16 -07:00
Thatcher Peskens 85e0f5a874 Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst
Upstream-commit: c5f15dcd3de02a10452963a9c56cb2e587972f58
Component: engine
2013-05-24 14:42:00 -07:00
Guillaume J. Charmes 2f5c9ae5ec Merge pull request #630 from dotcloud/check_if_logged_before_pull-fix
add login check before pull user's repo
Upstream-commit: d8e60b797fadfd1f03d518d0e9869bae4595cd6a
Component: engine
2013-05-24 12:29:59 -07:00
Guillaume J. Charmes d66839e06f Fix merge issue
Upstream-commit: a3293ed854675074d7f5d5c2bca63ba9fa599deb
Component: engine
2013-05-24 11:56:21 -07:00
Guillaume J. Charmes db38840f84 Merge branch 'master' into help_command-fix
Conflicts:
	commands.go
Upstream-commit: 3d1bc2660c626d755582929b2e6229bfa8b625aa
Component: engine
2013-05-24 11:46:18 -07:00
Guillaume J. Charmes e668458c4b Simplify the Host flag parsing
Upstream-commit: bfb65b733a2cfa0dac6a5760897f09d8e2557381
Component: engine
2013-05-24 11:31:36 -07:00
Guillaume J. Charmes 68053e95b6 Gofmt
Upstream-commit: ae72c2f4d6c37a14fcd81658f6ae42d65f5c7169
Component: engine
2013-05-24 11:31:19 -07:00
Guillaume J. Charmes 0575fdb313 Fix issue within auth test
Upstream-commit: 0146f65a448d2d42271300f1477ea9fa378d6360
Component: engine
2013-05-24 11:31:11 -07:00
Guillaume J. Charmes b350e4c829 Catch sigwinch client
Upstream-commit: deb9963e6e5871d53ab1d75c90bbf2da53ffcb36
Component: engine
2013-05-24 11:07:32 -07:00
Victor Vieux 2b952c89ae bump to master
Upstream-commit: d7b01c049d7f965b972603bc038922342fc67d68
Component: engine
2013-05-24 16:50:16 +00:00
Victor Vieux 1cfe074da1 use -H
Upstream-commit: 92e4a51965ce862ad1b4682a68b33550f2fd613f
Component: engine
2013-05-24 16:49:18 +00:00
Victor Vieux 10117596bb first version of Pull
Upstream-commit: 3c7bca7a215f9a44af4d6e026a6e8b230d808a83
Component: engine
2013-05-24 16:34:03 +00:00
kim0 2b0dd49ab1 Avoid hardcoding kernel 3.8 version, allow Ubuntu updates to work
Upstream-commit: 8dc2ad2c06fabb6501f0adff80761898bed5bc6f
Component: engine
2013-05-24 17:44:02 +02:00
Victor Vieux bad97e351a fix docker login when same username
Upstream-commit: 1f23b4caae6cd60a2bc1911c17fcebcadc539497
Component: engine
2013-05-24 14:23:43 +00:00
Victor Vieux 4631590cee removed useless params
Upstream-commit: 4dab2fccd39858c0fb3b783a612fb95173d34f7b
Component: engine
2013-05-24 12:43:24 +00:00
Victor Vieux 0faea4838c change %f to %g
Upstream-commit: a7d7a0665573b3db46963e4eb083f24470aad082
Component: engine
2013-05-24 12:23:28 +00:00
Victor Vieux aa6ea9bb08 bump to master
Upstream-commit: 9ebfcc9a152b9e00b166a0d4fb385b61e8330607
Component: engine
2013-05-24 12:17:44 +00:00
Guillaume J. Charmes 767f8e7e9d Add resize endpoint to api
Upstream-commit: 70d2123efda0e92760b96b03ce27cb4f1fb61cb3
Component: engine
2013-05-23 19:33:28 -07:00
Will Dietz ba9a93959a 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.
Upstream-commit: 83bc5b7435565d227a7745f4832bc9ce6be7a80d
Component: engine
2013-05-23 15:54:51 -05:00
Guillaume J. Charmes a518559330 Bumped version to 0.3.3
Upstream-commit: 822056094aa31c224e78cd568e02fe5458a0eecc
Component: engine
2013-05-23 12:46:14 -07:00
Daniel Mizyrycki 7e99dbb632 Packaging: Update changelog for release 0.3.3
Upstream-commit: d17c0b83681d45f4b4c57ca66cfc574246fd6618
Component: engine
2013-05-23 12:45:00 -07:00
Solomon Hykes 0806baee13 * Build: leave temporary containers untouched after a failure to help debugging
Upstream-commit: e0e385ac696c339958cdb9b4094c25f120dae1ec
Component: engine
2013-05-23 11:12:54 -06:00
Solomon Hykes 0ae0970978 * Remote API: add versioning
Upstream-commit: 66f3a96983ab5c71e1c21e04acfd5a7d199b6840
Component: engine
2013-05-23 10:44:36 -06:00
Victor Vieux 386eeafd7a 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
Upstream-commit: 31c98bdaafd806d7c5e44f2ed25cf57e7ef20827
Component: engine
2013-05-23 16:32:39 +00:00
Victor Vieux c30cd2c29a added warning
Upstream-commit: 59835135c572db08798dde7a5e211e7f4b453742
Component: engine
2013-05-23 16:15:36 +00:00
Victor Vieux 95bff3248e switch to default 127.0.0.1, and mixed the two flags in one. -h
Upstream-commit: 13f1939a6316079c14bac5434ecc2c955af1d1fb
Component: engine
2013-05-23 16:09:28 +00:00
Solomon Hykes 149569d0df Re-ordered and re-titled kernel requirement details to match the shortlist
Upstream-commit: dbb7b60cfc97dc1b7a1412775475048b6bf18e67
Component: engine
2013-05-23 09:49:53 -06:00
Solomon Hykes bda804d554 Simplified and clarified kernel install instructions
Upstream-commit: e77263010ce882790f12dfcd0841ea784dab0738
Component: engine
2013-05-23 09:47:20 -06:00
Solomon Hykes 701df1c2f1 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 2cf29893b3b1e6fc526bdf45734f942317598611
Component: engine
2013-05-23 09:33:34 -06:00
Victor Vieux 4904dcf8ba jsonstream WIP
Upstream-commit: cf35e8ed81029a3c2717659eac7979017bb01890
Component: engine
2013-05-23 15:16:35 +00:00
Andreas Tiefenthaler 349847e8ba Fixing two typos in the run help
Upstream-commit: 9e0427081e80dbf6c7702c8428ec64e40f362804
Component: engine
2013-05-23 18:09:59 +03:00
Solomon Hykes aad55db6f3 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: bc3675d471d6ca28751c1c8196a6f9bb476557c1
Component: engine
2013-05-23 09:01:40 -06:00
Thatcher 1ac07a6fad Merge pull request #683 from rogaha/doc_meta_info_update
Looks good. Thanks!  Closes #637
Upstream-commit: 422edd513a5e1ea30ea65352af213af7856a661e
Component: engine
2013-05-22 19:09:32 -07:00
rogaha 7040df6614 added/modifed tittle, description and keywords
changed the title prefix to sufix + Documentation
Upstream-commit: 18cb5c9314dbc9a0aa857211b124a3feb85c5274
Component: engine
2013-05-22 17:52:48 -07:00
Thatcher Peskens bab324a828 Fix broken image on README, closes #680
Upstream-commit: f008d1107c1702a2c3337e4515c6f72db557013b
Component: engine
2013-05-22 16:04:33 -07:00
Eric Hanchrow de6c1ab33b Use 127.0.0.1 instead of hostname in the "access the web app" section.
Upstream-commit: 056698b67678d7dd687e08401386c35cd5cb9d77
Component: engine
2013-05-22 12:54:50 -07:00
Eric Hanchrow 196dbee62c Merge remote-tracking branch 'upstream/master'
Conflicts:
	docs/sources/examples/python_web_app.rst
Upstream-commit: b4198de6bfb122ca2654a500a0b7bedb5e94badc
Component: engine
2013-05-22 12:52:14 -07:00
Victor Vieux c981be44f5 improved doc and usage
Upstream-commit: 800b401f0ba706f8f09b5beacd335caf4548e63c
Component: engine
2013-05-22 16:15:52 +00:00
Victor Vieux 41d3215b3f api versionning
Upstream-commit: faae7220c019882a2160aeea6bebc46c15d702be
Component: engine
2013-05-22 15:29:54 +00:00
Ken Cochrane 6b8b1213b3 Merge pull request #668 from christophercurrie/patch-1
- Documentation: Fix typos in the python web app example docs.
Upstream-commit: 1ccc7bdd9083f8970d73a66c86a520dca08b371c
Component: engine
2013-05-22 07:52:46 -07:00
Victor Vieux e974a23746 fix content type in doc
Upstream-commit: 949a649cc2364f796daae14fa3b044432e25efdf
Component: engine
2013-05-22 13:49:12 +00:00