934fcbd514
Merge pull request #719 from dotcloud/json_stream-feature
...
* API: push, pull, import, insert -> Json Stream
Upstream-commit: 9bc71c101c8f1299427013bfb5503bf85173c28f
Component: engine
2013-05-31 16:05:15 -07:00
9e1e927a3a
Merge pull request #766 from dotcloud/prevent_attach_stopped_container-feature
...
returns an error if the container we want to attach is not running
Upstream-commit: 7d167590bc0d35edf6b0a77ef01b340685108545
Component: engine
2013-05-31 14:41:57 -07:00
8205a10135
Merge pull request #753 from dotcloud/registry_api_remove_teams
...
Remove teams from the registry API
Upstream-commit: 76bb920449f727bfc05c322f78585f9b330ba354
Component: engine
2013-05-31 12:41:12 -07:00
86f679c012
Fix minor documentation error in ‘Running Redis Service’ example
...
Upstream-commit: fd0c501e6d65b665cba87f3449e02a722d90e6b1
Component: engine
2013-05-31 12:19:49 -07:00
3efe0a345b
returns an error if the container we want to attach is not running
...
Upstream-commit: 468e4c4b565d25b03c68ce2ab31f9a52f7b3398a
Component: engine
2013-05-31 15:34:23 +00:00
0dcec39d12
add -t parameter in the doc
...
Upstream-commit: 2baea2487936c3d385671d25ab3ef1b09f9007cc
Component: engine
2013-05-31 14:40:09 +00:00
919fd1400e
Merge pull request #745 from rogaha/doc_ssh_service_example_uptd
...
Add screencast summary. Makes it easy to reproduce steps.
Upstream-commit: 1c091657d44784a049b115892bd6ff812268688b
Component: engine
2013-05-30 18:49:32 -07:00
fcc4d17c47
Merge branch 'master' into builder_server-2
...
Upstream-commit: 4205b6bb1dfa06b70e969286ac911f744a88cb81
Component: engine
2013-05-30 14:09:42 -07:00
fc9613526d
Update docker build docs
...
Upstream-commit: 28d5b2c15acc6e088a0abd2099a00ba1180beb3e
Component: engine
2013-05-30 12:35:19 -07:00
d94ac95c85
Merge pull request #747 from riccieri/patch-1
...
+ * Documentation: add IP forwarding config to archlinux guide
Upstream-commit: 5324614410efc2e69d6f78a78763fde6bc3cba2d
Component: engine
2013-05-30 11:59:53 -07:00
bc3ec475fa
Remove special case for 'teams' from registry api
...
Upstream-commit: 531b30119ab5422f9f34ebf3be1a6b6578ded9f1
Component: engine
2013-05-30 11:37:58 -07:00
3224305e04
* Documentation: removed 'building blocks' for now.
...
Upstream-commit: 2ed1092dad9d2dec30945b06572befbba003ed1d
Component: engine
2013-05-30 11:26:47 -07:00
f05f5b2a20
Add IP forwarding config to archlinux guide
...
I had this small issue when following this guide on my Arch box, and I don't think it is specific to any configuration I have.
Upstream-commit: b2084a9c599d91fa1460116ef0c8d509d3353103
Component: engine
2013-05-30 01:56:08 -03:00
41337f44f2
Update build doc
...
Upstream-commit: 92939569ab06d13cd179d6e998ef9576d3921bb6
Component: engine
2013-05-29 11:53:44 -07:00
cbcfc9c00c
Update docker build docs
...
Upstream-commit: d97fff60a9275324290bb01b921c9b6b0967a4fd
Component: engine
2013-05-29 11:50:49 -07:00
613b6a4f42
updated the running ssh service example with the video's transcription
...
Upstream-commit: c7af917d13c34c6a008df60fa45079fab32cea70
Component: engine
2013-05-29 11:29:30 -07:00
06534c45f7
bump to master
...
Upstream-commit: f339fc2eb921986749a628b92d2c9f2ecf47e3c2
Component: engine
2013-05-29 13:52:18 +00:00
d4ee5e174d
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 83db1f36e30ff2188ee3cf5908b65534e693654e
Component: engine
2013-05-28 19:39:20 -07:00
52887551f6
Documented who decides what and how.
...
Upstream-commit: 24ddfe3f25f99db5a23f62d411c949b2236288a1
Component: engine
2013-05-28 19:39:09 -07:00
1e4dfca884
Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature
...
* API: rename containers/ps to containers/json
Upstream-commit: f65327555e00dcfb2691e8a2df1c57cb011a0898
Component: engine
2013-05-28 15:44:20 -07:00
f9120d99fa
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 522f399d689ebd7ae76ffce07507549ee5887238
Component: engine
2013-05-28 14:57:50 -07:00
f4d5babfe8
De-duplicated contribution instructions. The authoritative instructions are in CONTRIBUTING.md at the root of the repo.
...
Upstream-commit: 326faec6642896954ffbd407eeda7d19da193856
Component: engine
2013-05-28 14:57:36 -07:00
49e1d5125f
Merge pull request #702 from kim0/patch-2
...
Properly install ppa, avoid GPG key warning. Also closes #715
Upstream-commit: 28a30eda880ceac876c6ce3791672bf1e6b2ebe5
Component: engine
2013-05-28 14:17:59 -07:00
da7e3d29eb
Merge pull request #733 from meejah/master
...
Documentation: Use add-apt-repository instead of editing sources.list
Upstream-commit: f3cc1d985e91e19012c65c0c14c4ddc664438631
Component: engine
2013-05-28 13:55:11 -07:00
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
ca4176193b
Add sudo to commands.
...
Upstream-commit: 444f7020cbc639fd781744be207c843aaf663077
Component: engine
2013-05-28 10:56:26 -06:00
d4815bdeb7
Use Ubuntu's built-in method to add a PPA repository, which correctly handles keys for you.
...
Upstream-commit: 525080100d2e2a7899c9a51a1ca57e28e32e8488
Component: engine
2013-05-28 10:54:32 -06:00
a20c31a039
rename containers/ps to containers/json
...
Upstream-commit: 4f9443927e8bc8a724b43afae6cf7a183cd9acd0
Component: engine
2013-05-28 16:08:05 +00:00
663bde65c3
documentation
...
Upstream-commit: 8699805756d25602e2412173aac7364fbe9627c7
Component: engine
2013-05-28 15:49:57 +00:00
9a8934c1af
Fix attach API docs.
...
Upstream-commit: 7d6ff7be129d70f0ff5c50a47d70a32a1e6274bc
Component: engine
2013-05-28 06:27:12 -07:00
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
fdc407078f
* Registry: specified naming restrictions for usernames and repository names
...
Upstream-commit: df23a1e675c7e3cbad617374d85c48103541ee14
Component: engine
2013-05-24 18:58:24 -07:00
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
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
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
aa6ea9bb08
bump to master
...
Upstream-commit: 9ebfcc9a152b9e00b166a0d4fb385b61e8330607
Component: engine
2013-05-24 12:17:44 +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
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
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
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
