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
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
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
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
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
9ef178686d
Merge pull request #653 from dotcloud/builder_client
...
* Builder: Move the Builder to the client
Upstream-commit: d37dea318e5e3b6813f26ef04f635339f6821026
Component: engine
2013-05-20 17:50:17 -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
3e19186e1e
Merge fix
...
Upstream-commit: 0d2fb295375ce74764b8d4cb2b03c19cd4e01cb4
Component: engine
2013-05-20 16:21:35 -07:00
11382da61c
Allow multiple syntaxes for CMD
...
Upstream-commit: 13e687e5790f05552f9be84bf1d60d37fca4c078
Component: engine
2013-05-20 16:00:51 -07:00
e4d2026b9c
Make docker client an interface
...
Upstream-commit: b06784b0dd2e86a7450fab30707468acfae5d7aa
Component: engine
2013-05-20 16:00:16 -07:00
d4d1d3980d
Tag all images after pulling them
...
Upstream-commit: d756ae4cb376e218ff4dd35a7b9a9fa346fbb04d
Component: engine
2013-05-20 15:19:05 -07:00
aca8345b41
Isolate run() from commit
...
Upstream-commit: c6bc90d02daa2f7086a1c7469c7239911c2bc357
Component: engine
2013-05-20 15:02:32 -07:00
73e1ea3706
Make sure to have a command to execute upon commit
...
Upstream-commit: b51303cddce2cbb22fc3ee0de9d9125bec2f029a
Component: engine
2013-05-20 13:50:50 -07:00
1215d8cad2
Add "Cmd" prefix to builder instructions
...
Upstream-commit: c2a14bb196d0d3046e185783ebacd4b83fa36dd4
Component: engine
2013-05-20 12:09:15 -07:00
4582eb4daf
Merge pull request #625 from dotcloud/remove-hijack
...
Remove hijack from api when not necessary
Upstream-commit: bebbbf914b241448c6304c915c708f7cbc582c06
Component: engine
2013-05-20 11:27:07 -07:00
67c2cf9c02
Merge remove-hijack
...
Upstream-commit: 372d81c32593da877685851b9cb85c688c59b998
Component: engine
2013-05-20 11:07:34 -07:00
a82b37a1d2
Avoid cast each write for flusher
...
Upstream-commit: ae9d7a5167da58de9a1a4beac489cf1e6adcea11
Component: engine
2013-05-20 10:58:35 -07:00
02712aaba2
Merge pull request #652 from unclejack/fix-compilation-on-linux
...
fix compilation on linux
Upstream-commit: 0bb54813d43728f93f41ef4cf015a62ec95d102c
Component: engine
2013-05-20 10:55:17 -07:00
543cef1b6d
fix compilation on linux
...
Upstream-commit: 1b007828c93bc472af3306b8da1d72a84b484f12
Component: engine
2013-05-20 20:43:09 +03:00
73460590ba
Make the printflfush an interface
...
Upstream-commit: 98b0fd173b7b59316d776534b84ecc9ab0a1da77
Component: engine
2013-05-20 10:22:50 -07:00
6c6cf1e168
Merge pull request #639 from fsouza/fix-utils-darwin
...
utils: fix compilation on Darwin
Upstream-commit: 2879ef46420316038e8048b17eb96b53283332a0
Component: engine
2013-05-20 10:10:30 -07:00
5af4d13b11
Merge pull request #645 from fsouza/fix-api-docs
...
- Documentation: remove trunc_cmd from /containers/ps example no longer needed.
Upstream-commit: b3101beb47f62a3af5be72ff404733518856bd7c
Component: engine
2013-05-20 07:52:22 -07:00
43ff0f8506
Merge pull request #646 from kirang89/master
...
- Documentation: Fixed typos in README
Upstream-commit: 580df1dfc6ec6002bb5be9226f71cc1e4fd64f7c
Component: engine
2013-05-19 16:53:33 -07:00
ce120b932a
Move docker build to client
...
Upstream-commit: 0f312113d3ce37d57fb28eb98c8abcdcbfcd39a3
Component: engine
2013-05-19 10:46:24 -07:00
d97e9f4c66
Fixed typos
...
Upstream-commit: 0b785487fe752cc4111a3f0005a2ae090b30c52b
Component: engine
2013-05-19 21:04:34 +05:30
1c04239110
docs/remote_api: remove trunc_cmd from /containers/ps example
...
Apparently, this parameter does not exist anymore.
Upstream-commit: 8291f8b85ca653e13f17ffb126b57bb6b40c1cb5
Component: engine
2013-05-19 11:57:45 -03:00
3765bead85
Merge pull request #644 from philspitler/master
...
- Documentation: Fixed typo in remote api docs
Upstream-commit: 6471fd3825abdcf40a99f59d609a093ae82c523a
Component: engine
2013-05-19 06:41:26 -07:00
90b893aa81
Fixed typo in remote API doc
...
Upstream-commit: ea7fdecd41a107d038503578324197780df002a8
Component: engine
2013-05-19 09:37:02 -03:00
38bbb0a8b8
utils: fix compilation on Darwin
...
Although Docker daemon does not work on Darwin, the API client will have
to work. That said, I'm fixing the compilation of the package on Darwin.
Upstream-commit: 2b55874584f034b5113359ced6b05c143d31e03c
Component: engine
2013-05-19 00:02:42 -03:00
8b5995d5c6
Merge pull request #632 from jpetazzo/626-kernel-docs
...
+ Documentation: Added a section for Kernel requirements to the Docker Docs.
Upstream-commit: 66e9f155c3e62bcb681ed302a21d758d09c81d51
Component: engine
2013-05-18 07:53:45 -07:00
