Commit Graph

20395 Commits

Author SHA1 Message Date
2b952c89ae bump to master
Upstream-commit: d7b01c049d7f965b972603bc038922342fc67d68
Component: engine
2013-05-24 16:50:16 +00:00
1cfe074da1 use -H
Upstream-commit: 92e4a51965ce862ad1b4682a68b33550f2fd613f
Component: engine
2013-05-24 16:49:18 +00:00
10117596bb first version of Pull
Upstream-commit: 3c7bca7a215f9a44af4d6e026a6e8b230d808a83
Component: engine
2013-05-24 16:34:03 +00:00
f4c4eec030 Properly install ppa, avoid GPG key warning
Upstream-commit: 4e576f047fc8a5a75fa88a66132bdade4f3a1e44
Component: engine
2013-05-24 18:55:32 +03:00
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
bad97e351a fix docker login when same username
Upstream-commit: 1f23b4caae6cd60a2bc1911c17fcebcadc539497
Component: engine
2013-05-24 14:23:43 +00:00
317a026976 fix: Can't lookup root of unregistered image
Upstream-commit: 1c946ef0038a27d134f497ed72352136c0a4bb9e
Component: engine
2013-05-24 13:03:09 +00:00
4631590cee removed useless params
Upstream-commit: 4dab2fccd39858c0fb3b783a612fb95173d34f7b
Component: engine
2013-05-24 12:43:24 +00:00
0faea4838c change %f to %g
Upstream-commit: a7d7a0665573b3db46963e4eb083f24470aad082
Component: engine
2013-05-24 12:23:28 +00:00
aa6ea9bb08 bump to master
Upstream-commit: 9ebfcc9a152b9e00b166a0d4fb385b61e8330607
Component: engine
2013-05-24 12:17:44 +00:00
767f8e7e9d Add resize endpoint to api
Upstream-commit: 70d2123efda0e92760b96b03ce27cb4f1fb61cb3
Component: engine
2013-05-23 19:33:28 -07:00
d48f264028 remove unused function
Upstream-commit: 2cd00a47a5a8f405eb6a7b3f34edaf38c89e9b1c
Component: engine
2013-05-23 18:34:38 -07:00
a2645c511c Add missing buildfile.go
Upstream-commit: e3f04298597195a95557c4224c05df752dc08695
Component: engine
2013-05-23 18:33:31 -07:00
0efa7869ac Implement Context within docker build (not yet in use)
Upstream-commit: d42c10aa094e39d8c1184b61c98777d8c59ae900
Component: engine
2013-05-23 18:32:56 -07:00
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
a518559330 Bumped version to 0.3.3
Upstream-commit: 822056094aa31c224e78cd568e02fe5458a0eecc
Component: engine
2013-05-23 12:46:14 -07:00
7e99dbb632 Packaging: Update changelog for release 0.3.3
Upstream-commit: d17c0b83681d45f4b4c57ca66cfc574246fd6618
Component: engine
2013-05-23 12:45:00 -07:00
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
0ae0970978 * Remote API: add versioning
Upstream-commit: 66f3a96983ab5c71e1c21e04acfd5a7d199b6840
Component: engine
2013-05-23 10:44:36 -06:00
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
c30cd2c29a added warning
Upstream-commit: 59835135c572db08798dde7a5e211e7f4b453742
Component: engine
2013-05-23 16:15:36 +00:00
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
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
bda804d554 Simplified and clarified kernel install instructions
Upstream-commit: e77263010ce882790f12dfcd0841ea784dab0738
Component: engine
2013-05-23 09:47:20 -06:00
701df1c2f1 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 2cf29893b3b1e6fc526bdf45734f942317598611
Component: engine
2013-05-23 09:33:34 -06:00
4904dcf8ba jsonstream WIP
Upstream-commit: cf35e8ed81029a3c2717659eac7979017bb01890
Component: engine
2013-05-23 15:16:35 +00:00
349847e8ba Fixing two typos in the run help
Upstream-commit: 9e0427081e80dbf6c7702c8428ec64e40f362804
Component: engine
2013-05-23 18:09:59 +03:00
aad55db6f3 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: bc3675d471d6ca28751c1c8196a6f9bb476557c1
Component: engine
2013-05-23 09:01:40 -06:00
183381f196 switch to SI standard and add test
Upstream-commit: b45143da9b275b5003c23667b0988ad93f383b11
Component: engine
2013-05-23 10:29:09 +00:00
87ab4000ad fix typo
Upstream-commit: ed56b6a905d5e9f443cb0c5c949965f848abbe8d
Component: engine
2013-05-23 09:35:20 +00:00
b0dbe9b6ac Start moving the docker builder into the server
Upstream-commit: 0f135ad7f31df2952352feb9ef00863d61577467
Component: engine
2013-05-22 20:07:26 -07:00
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
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
bab324a828 Fix broken image on README, closes #680
Upstream-commit: f008d1107c1702a2c3337e4515c6f72db557013b
Component: engine
2013-05-22 16:04:33 -07:00
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
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
c981be44f5 improved doc and usage
Upstream-commit: 800b401f0ba706f8f09b5beacd335caf4548e63c
Component: engine
2013-05-22 16:15:52 +00:00
41d3215b3f api versionning
Upstream-commit: faae7220c019882a2160aeea6bebc46c15d702be
Component: engine
2013-05-22 15:29:54 +00:00
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
e974a23746 fix content type in doc
Upstream-commit: 949a649cc2364f796daae14fa3b044432e25efdf
Component: engine
2013-05-22 13:49:12 +00:00
8c3121bf04 bump to master
Upstream-commit: 6fce89e60b71ee2306d66003697b6c746c456250
Component: engine
2013-05-22 13:41:29 +00:00
eb4c932aff Apparent typos in the docs.
Upstream-commit: 5818813183bfb61180846f2b1b23a6fdcb2c9cdd
Component: engine
2013-05-21 21:45:27 -06:00
22c50f73c6 add regexp check on repo's name
Upstream-commit: 4489005cb2f11fe6e2dcdb181b4834791de3b73f
Component: engine
2013-05-21 12:53:05 +00:00
726c3246c2 add -host and -port
Upstream-commit: a3ccec197e847a996e725d87177067dba98bcca6
Component: engine
2013-05-21 10:14:58 +00:00
3c7eed1673 Remove no longer needed tests
Upstream-commit: 3f22842542a17d41f72b4943d19d244f2296b418
Component: engine
2013-05-20 17:54:54 -07:00
838989cd24 Update docker builder doc
Upstream-commit: 218812eb3cfeb5c5253ed6a54ed3e45c1107ffd1
Component: engine
2013-05-20 17:52:39 -07:00
e1a5e6c271 Fix an issue trying to pull specific tag
Upstream-commit: 49505c599b3a65196b6b6f746f4bfad3a417dd7a
Component: engine
2013-05-20 17:30:33 -07:00
8cf91cef6b Use pointers for the object methods
Upstream-commit: f35f084059e5c34940f74f55ad32ecfcd78ce61c
Component: engine
2013-05-20 16:35:28 -07:00
78fdb08a7e Install curl; nix stray backslash; use proper IP address
Upstream-commit: 3a9ef5f9bbae19ae5ac4108dbbaed649e26d942e
Component: engine
2013-05-20 16:31:39 -07:00
3e19186e1e Merge fix
Upstream-commit: 0d2fb295375ce74764b8d4cb2b03c19cd4e01cb4
Component: engine
2013-05-20 16:21:35 -07:00