6ed4740f8b
Merge pull request #1197 from crosbymichael/buildfile-doc-ordering
...
Fix Docker Builder documentation section numbers
Upstream-commit: 8e6c249e485a8cce37dbfb6b897730bca8bbdca8
Component: engine
2013-07-12 05:27:47 -07:00
5d09c440fb
Merge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature
...
* Client: Add options to docker login to be able to use it via script
Upstream-commit: 752f99e8a18a5e16f2a93b0fac1984b3a4412346
Component: engine
2013-07-12 05:07:25 -07:00
c22c23bfc2
Merge branch 'master' into list_container_processes-feature
...
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
6a215f8175
Fix Docker Builder documentation numbering
...
Upstream-commit: 90483dc9123d6cb9eb1aa1bf4ba4e851d751784e
Component: engine
2013-07-11 16:41:19 -09:00
900f657bd8
Merge pull request #1124 from crosbymichael/buildfile-volumes
...
+ Builder: Add VOLUME instruction to buildfile
Upstream-commit: 637eceb6a797df45b99f3ea929f7900e75e5fc97
Component: engine
2013-07-11 17:16:57 -07:00
7935041f18
Add VOLUME instruction to buildfile
...
Upstream-commit: eb9fef2c424178277cacd29d404cc8e774bb3891
Component: engine
2013-07-10 06:59:16 -09:00
63618e51b5
Fix outdated docs explaining how to setup a dev environment. Building docker with docker ftw
...
Upstream-commit: a839b36e55da231874b312ee184c9d8164460bdc
Component: engine
2013-07-09 16:48:16 -07:00
7033d58dca
Fix installation link from welcome page.
...
Upstream-commit: 11998ae7d62ee17856ead81ce49409dc63643d62
Component: engine
2013-07-02 16:48:57 -07:00
d5551edef2
Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
...
Conflicts:
docs/sources/concepts/manifesto.rst
docs/sources/index.rst
Upstream-commit: 96ab3c540d5f9f8509380f50e790b184beb2be6b
Component: engine
2013-07-02 15:10:07 -07:00
92fbe05ddb
Cleaning up the welcome page, terminology, and images.
...
Upstream-commit: ff964d327d030221b4e65661cee0ee0826bcdb32
Component: engine
2013-07-02 15:03:29 -07:00
4deb63608f
Fix broken quickstart link
...
Upstream-commit: 4b8688f1e5a5998e10bdc1d7b39458a611a25eef
Component: engine
2013-07-02 14:10:06 -07:00
b8221b0ce7
Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
...
Conflicts:
docs/sources/concepts/manifesto.rst
Upstream-commit: 55b5889a0fa74db30e6a07f84b02e22ea41c3e19
Component: engine
2013-07-02 13:00:08 -07:00
ad16b4b27c
Shortened lines to 80 columns
...
Upstream-commit: dd4c6f6a09c98f075fc5964242792d9e9f2c20d4
Component: engine
2013-07-02 12:09:57 -07:00
df5dac21e6
Clean up image text, minor updates to docs.
...
Upstream-commit: 6058261a26b9e23926612fddfd8ad37bfcf1dd9c
Component: engine
2013-07-02 12:09:57 -07:00
09eb5cc9ff
Adding files for terms
...
Upstream-commit: b461e4607de497096b0ec92bb05d5a88bfe0e48d
Component: engine
2013-07-02 12:09:57 -07:00
66a935418f
Cleaning up the welcome page, terminology.
...
Upstream-commit: d399f720983d94706bdaae528a2637778ca5b5e0
Component: engine
2013-07-02 12:09:57 -07:00
de55ad0e3d
Clean up image text, minor updates to docs.
...
Upstream-commit: b47873c5accd33964c33f718ceeda955d1a9a3c8
Component: engine
2013-07-01 16:37:13 -07:00
c4bb1a9c18
Adding files for terms
...
Upstream-commit: adf75d402ab428a16ac3d57d0154ddd02be2fb6b
Component: engine
2013-07-01 16:37:13 -07:00
52be3958ff
Cleaning up the welcome page, terminology.
...
Upstream-commit: cb1fdb2f0380e43f38f3b37562edc83122c8349f
Component: engine
2013-07-01 16:37:13 -07:00
4af6128790
Merge pull request #1086 from crosbymichael/1008-image-entrypoint
...
+ Builder: Add Entrypoint to builder and container config
Upstream-commit: 185a2fc55e64a828d8443b912505283b6f8b97d4
Component: engine
2013-07-01 13:33:12 -07:00
9e16e5309d
Issue #1087 Docker Java API client -- added java to Docker Remote API Client document
...
Upstream-commit: aa9bec96b1d3aedcb67e6985ae5754e728665407
Component: engine
2013-07-01 11:28:40 -07:00
ab729772a8
change to top
...
Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c
Component: engine
2013-07-01 15:19:42 +00:00
2e70c0f0f0
Add Entrypoint to builder and container config
...
By setting an entrypoint in the Dockerfile this
allows one to run an image and only pass arguments.
Upstream-commit: b16ff9f8598d30823f687d100d351cad11823e77
Component: engine
2013-07-01 05:34:27 -09:00
867f33af50
fix status code in doc
...
Upstream-commit: 8dcc6a0280720237008e36e893028032cd66aa2a
Component: engine
2013-07-01 13:28:58 +00:00
4b2d50c5e8
rebase master
...
Upstream-commit: 3b5ad44647bf4033502594a4048bffea656b2a08
Component: engine
2013-07-01 12:31:16 +00:00
5783230d1b
Add doc
...
Upstream-commit: 8589fd6db8d52f93ba64a0d72c6eebe8d50530f6
Component: engine
2013-06-28 18:05:41 +02:00
26d95fb135
Merge pull request #1028 from dhrp/bugfixes-on-docs
...
Bugfixes on documentation code
Upstream-commit: e12a204bccfc65b31a484944beb3d61aabe2d362
Component: engine
2013-06-27 19:01:13 -07:00
a223caa9e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
...
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
e0c6d66dac
Bugfixes on docs
...
* fixed canonical link from index
* added http redirect from builder/basics
* fixed url in redirect_home
Upstream-commit: 73afc6311daf6bce10d081352aa1efbfcb406d10
Component: engine
2013-06-25 15:31:22 -07:00
b1a130438c
Added Swipely's docker-api gem to the table of Remote API Client
...
Libraries.
Upstream-commit: d03edf12e4ad67f0900434af5c8d36688b6cc2a4
Component: engine
2013-06-25 08:26:41 -04:00
30b4c0d126
Merge pull request #932 from metalivedev/docs20130614
...
+ Documentation: Add terminology section
Upstream-commit: e2516c01b46ec41dc5dc3bce09f1e35fe3f7277b
Component: engine
2013-06-24 10:39:25 -07:00
3f92ee019d
merge master and add doc
...
Upstream-commit: 4d1692726b5e7cfc1b58245afc48c1591724369f
Component: engine
2013-06-22 01:08:20 +02:00
9d597b11de
Merge pull request #848 from dotcloud/builder_server-3
...
Improve Docker build
Upstream-commit: de1a5a75cc5ae9d1084885d810d5715ee900f16d
Component: engine
2013-06-21 14:55:08 -07:00
7ab6c2d54d
Remove deprecated INSERT from documentation
...
Upstream-commit: 169ef21de768a45805f2afc56b3e5c6f21130b92
Component: engine
2013-06-21 14:12:52 -07:00
b6d1924c7d
Update api docs
...
Upstream-commit: d0fa6927f8ad87e73a02f64ae9d6db6a820c1f4c
Component: engine
2013-06-21 13:51:48 -07:00
58b777a3ce
Merge pull request #975 from unclejack/891-mark_command_as_optional
...
891 mark command as optional for docker run
Upstream-commit: 070e1aec7e1e308409dfd9132034ae4101d52977
Component: engine
2013-06-21 10:22:52 -07:00
fa5ff73c73
add options to docker login
...
Upstream-commit: 42bcfcc927499c63bbc3e3de80e6f52fd02fc9e8
Component: engine
2013-06-21 10:00:25 +00:00
32f89c6b42
Merge branch 'master' into fix-auth
...
Upstream-commit: 8f2a80804ce6f3ab77057a25180a27e3b346778b
Component: engine
2013-06-21 09:18:03 +00:00
b15d1e7cb5
fix doc post
...
Upstream-commit: 8e7d4cda078482b84836f51e3e7ce17aa0f65217
Component: engine
2013-06-21 11:13:13 +02:00
3b9f55c51c
docs: mark command as optional for docker run
...
Upstream-commit: 6a1279fb90ad33fec05a48529981db7bb093b782
Component: engine
2013-06-21 11:07:14 +03:00
7c517d635a
Merge branch 'simpler-build-upload' ( #900 ) into builder_server-3 ( #848 )
...
Upstream-commit: 352991bdf4c0a7702fcc791b961a516fb684f4c1
Component: engine
2013-06-20 22:02:36 -07:00
125ad1324c
Merge pull request #953 from rhysh/952-swapaccount-docs
...
- Documentation: fix inconsistent/outdated instructions for setting up "swapaccount"
Upstream-commit: 4383d7b603c873d38e4637a34c92c927bda4e7aa
Component: engine
2013-06-20 20:49:44 -07:00
a4e9bba7a3
Merge branch 'master' into simpler-build-upload
...
Conflicts:
api.go
builder_client.go
commands.go
Upstream-commit: e43323221b15d90956a200754bbf3e1d92d7bb1c
Component: engine
2013-06-20 14:19:09 -07:00
f26e4fdaf0
Fixed API version numbers in api docs
...
Upstream-commit: cff2187a4ccf90a5be821c316b564e934d80998c
Component: engine
2013-06-20 12:30:02 -07:00
a1d1477844
Merge pull request #938 from dotcloud/add_unix_socket-feature
...
* Runtime: Add unix socket and multiple -H
Upstream-commit: fa68fe6ff3315757c1be60a3daf73f375974ddb5
Component: engine
2013-06-20 11:17:16 -07:00
9587bb386c
Merge branch 'master' into builder_server-3
...
Conflicts:
docs/sources/use/builder.rst
Upstream-commit: 659e8460060d2216329d874cf6617fc24ec479fd
Component: engine
2013-06-20 10:27:12 -07:00
e9a955e303
update docs
...
Upstream-commit: 05796bed57d4e1de352e02fcd6b28aed14f1b670
Component: engine
2013-06-20 12:34:08 +00:00
eb87dc37e0
Merge branch 'master' into simpler-build-upload
...
Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine
2013-06-19 18:48:19 -07:00
f576f996f6
* Remote API: updated docs for 1.3
...
Upstream-commit: d6ab71f450ac3673ffd4bc806de23e42a6d32c07
Component: engine
2013-06-19 15:03:33 -07:00
d5a28f01c8
the kernel needs "swapaccount=1" set - some docs are updated, this one seems to have slipped through
...
Fixes #952
Upstream-commit: 5fc1329b2fac25c85621d819c82253e9481196d4
Component: engine
2013-06-19 14:45:03 -07:00
