fe4868dfd9
Fix merge issue
...
Upstream-commit: b438565609917439cb4172717e5505c265c4e291
Component: engine
2013-05-24 14:48:13 -07:00
8e3c67a46e
Merge branch 'master' into tty_resize
...
Conflicts:
commands.go
Upstream-commit: ffd9e06deb9d222ac5e1f63734211c0503213e06
Component: engine
2013-05-24 14:45:31 -07:00
c479ea1a4b
Finish resize implementation client and server
...
Upstream-commit: 88ef309a940bcbb6f85a750372b8fdbc6569c3a7
Component: engine
2013-05-24 14:44:16 -07:00
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
4366224e14
Merge pull request #689 from dotcloud/help_command-fix
...
- Runtime: bring Error: Command not found: <command>
Upstream-commit: 064101d82e42c0be1a5e27905ba3496b628dba55
Component: engine
2013-05-24 12:01:19 -07:00
d66839e06f
Fix merge issue
...
Upstream-commit: a3293ed854675074d7f5d5c2bca63ba9fa599deb
Component: engine
2013-05-24 11:56:21 -07:00
db38840f84
Merge branch 'master' into help_command-fix
...
Conflicts:
commands.go
Upstream-commit: 3d1bc2660c626d755582929b2e6229bfa8b625aa
Component: engine
2013-05-24 11:46:18 -07:00
bb12d22810
Merge branch '573-add_host_port-feature'
...
Upstream-commit: 48fd8ae79c4ab33cd9198a7f72c615e46fa94fbc
Component: engine
2013-05-24 11:36:05 -07:00
3ba5b8785a
Merge pull request #661 from dotcloud/573-add_host_port-feature
...
+ Runtime: add -H flag to listen/connect to different ip/port
Upstream-commit: c167d603f2f9003a6b976f2e748549db8f56eca3
Component: engine
2013-05-24 11:32:57 -07:00
e668458c4b
Simplify the Host flag parsing
...
Upstream-commit: bfb65b733a2cfa0dac6a5760897f09d8e2557381
Component: engine
2013-05-24 11:31:36 -07:00
68053e95b6
Gofmt
...
Upstream-commit: ae72c2f4d6c37a14fcd81658f6ae42d65f5c7169
Component: engine
2013-05-24 11:31:19 -07:00
0575fdb313
Fix issue within auth test
...
Upstream-commit: 0146f65a448d2d42271300f1477ea9fa378d6360
Component: engine
2013-05-24 11:31:11 -07:00
b350e4c829
Catch sigwinch client
...
Upstream-commit: deb9963e6e5871d53ab1d75c90bbf2da53ffcb36
Component: engine
2013-05-24 11:07:32 -07:00
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
f24cf40e86
Merge pull request #701 from kim0/patch-1
...
- Documentation: Updated ubuntu install docs to avoid hardcoding kernel 3.8 version, and allow Ubuntu updates to work
Upstream-commit: 1b5ab5afe0c7ec8adf0d6c359b7a30c699a2d20b
Component: engine
2013-05-24 08:58:02 -07: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
5e71f995b8
Merge pull request #699 from dotcloud/docker_login-fix
...
fix docker login when same username
Upstream-commit: 58ce66e553ce0938430c01a27ed8ad32c23b1f0f
Component: engine
2013-05-24 07:32:38 -07:00
bad97e351a
fix docker login when same username
...
Upstream-commit: 1f23b4caae6cd60a2bc1911c17fcebcadc539497
Component: engine
2013-05-24 14:23:43 +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
555e20248f
Merge pull request #695 from dtzWill/694-fix-merge-config
...
- Runtime: utils.go: Fix merge logic for user and hostname.
Upstream-commit: ecb64be6a8c3de7e34b60c266b43a88a9b2124e6
Component: engine
2013-05-23 16:00:34 -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
35cd536bef
Merge pull request #688 from pxlpnk/patch-1
...
Fixing two typos in the run help
Upstream-commit: 5f30453bfe0475101619a84c483e41b1112e0a12
Component: engine
2013-05-23 08:21:05 -07: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
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
71cdc783ea
Merge pull request #681 from dhrp/680-fix-readme-image
...
Fix broken image on README, closes #680
Upstream-commit: 4d80924f7c751d9f907b173920256ec8d5dfac62
Component: engine
2013-05-22 16:09:21 -07:00
bab324a828
Fix broken image on README, closes #680
...
Upstream-commit: f008d1107c1702a2c3337e4515c6f72db557013b
Component: engine
2013-05-22 16:04:33 -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
c1e66110cb
Merge pull request #670 from dotcloud/669-wrong_content_type_create-fix
...
Fix content type in doc
Upstream-commit: 52113cc4431704b186727d917cda15411e671f50
Component: engine
2013-05-22 06:54:39 -07:00
e974a23746
fix content type in doc
...
Upstream-commit: 949a649cc2364f796daae14fa3b044432e25efdf
Component: engine
2013-05-22 13:49:12 +00:00
eb4c932aff
Apparent typos in the docs.
...
Upstream-commit: 5818813183bfb61180846f2b1b23a6fdcb2c9cdd
Component: engine
2013-05-21 21:45:27 -06:00
726c3246c2
add -host and -port
...
Upstream-commit: a3ccec197e847a996e725d87177067dba98bcca6
Component: engine
2013-05-21 10:14:58 +00:00
ad4dccdc0f
Merge pull request #658 from dotcloud/builder_client_doc
...
Builder client doc
Upstream-commit: e6e13d6adeee73802243837c10f73dd8364b70df
Component: engine
2013-05-20 18:14:44 -07:00
