Commit Graph
312 Commits
Author SHA1 Message Date
Michael Crosby 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
Victor Vieux 867f33af50 fix status code in doc
Upstream-commit: 8dcc6a0280720237008e36e893028032cd66aa2a
Component: engine
2013-07-01 13:28:58 +00:00
Thatcher 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
Gabriel Monroy 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
Thatcher Peskens 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
Tom Hulihan 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
Ken Cochrane 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
Victor Vieux 3f92ee019d merge master and add doc
Upstream-commit: 4d1692726b5e7cfc1b58245afc48c1591724369f
Component: engine
2013-06-22 01:08:20 +02:00
Guillaume J. Charmes 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
Guillaume J. Charmes 7ab6c2d54d Remove deprecated INSERT from documentation
Upstream-commit: 169ef21de768a45805f2afc56b3e5c6f21130b92
Component: engine
2013-06-21 14:12:52 -07:00
Guillaume J. Charmes b6d1924c7d Update api docs
Upstream-commit: d0fa6927f8ad87e73a02f64ae9d6db6a820c1f4c
Component: engine
2013-06-21 13:51:48 -07:00
Guillaume J. Charmes 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
Victor Vieux 32f89c6b42 Merge branch 'master' into fix-auth
Upstream-commit: 8f2a80804ce6f3ab77057a25180a27e3b346778b
Component: engine
2013-06-21 09:18:03 +00:00
Victor Vieux b15d1e7cb5 fix doc post
Upstream-commit: 8e7d4cda078482b84836f51e3e7ce17aa0f65217
Component: engine
2013-06-21 11:13:13 +02:00
unclejack 3b9f55c51c docs: mark command as optional for docker run
Upstream-commit: 6a1279fb90ad33fec05a48529981db7bb093b782
Component: engine
2013-06-21 11:07:14 +03:00
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes f26e4fdaf0 Fixed API version numbers in api docs
Upstream-commit: cff2187a4ccf90a5be821c316b564e934d80998c
Component: engine
2013-06-20 12:30:02 -07:00
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Victor Vieux e9a955e303 update docs
Upstream-commit: 05796bed57d4e1de352e02fcd6b28aed14f1b670
Component: engine
2013-06-20 12:34:08 +00:00
Solomon Hykes eb87dc37e0 Merge branch 'master' into simpler-build-upload
Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine
2013-06-19 18:48:19 -07:00
Solomon Hykes f576f996f6 * Remote API: updated docs for 1.3
Upstream-commit: d6ab71f450ac3673ffd4bc806de23e42a6d32c07
Component: engine
2013-06-19 15:03:33 -07:00
Rhys Hiltner 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
Solomon Hykes 937f62ca0a * Builder: correct the behavior of ADD when copying directories.
Upstream-commit: 507ea757a5d72af47b37af0e384e83fcea613a7b
Component: engine
2013-06-19 14:26:11 -07:00
Solomon Hykes 606a85a77c Merge pull request #924 from eliasp/remove-ifconfig-usage
* Documentation: replace `ifconfig` in docs with `iproute`
Upstream-commit: a056f1deeceac20a9212570ea8448911e3f0d1ed
Component: engine
2013-06-19 13:20:35 -07:00
Solomon Hykes f245288e89 Merge branch 'master' into fix-add-behavior
Upstream-commit: b368d21568ae12f7a7b7fe5e0afd0460e2057d78
Component: engine
2013-06-19 10:31:50 -07:00
Victor Vieux 901aace697 Merge branch 'master' into add_unix_socket-feature
Upstream-commit: d52af3f58f26c1bf1ea61af532385965434373eb
Component: engine
2013-06-19 12:49:27 +00:00
Victor Vieux bdd6ad8a7a update docs
Upstream-commit: 063c838c927615e9507eca2a5c2f38a5fc4c35b2
Component: engine
2013-06-19 12:48:50 +00:00
Solomon Hykes 41c1e7ceb7 * Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented.
Upstream-commit: 5be7b9af3ee9b884482220979735e2a8ea969ce3
Component: engine
2013-06-18 20:28:49 -07:00
Andy Rothfusz 8a4b4e8c79 Added multilayer example image.
Upstream-commit: 5183399f50e489204471393c4e89a0476f396b9b
Component: engine
2013-06-18 19:31:35 -07:00
Andy Rothfusz eb5b208b24 New Terminology section and illustrations.
Upstream-commit: a780b7c6b53fc15ef884def8696ac29f961acb2c
Component: engine
2013-06-18 19:31:35 -07:00
Guillaume J. Charmes 85dd5013c2 Merge pull request #885 from dotcloud/remove_bsdtar
* Runtime: Remove bsdtar dependency
Upstream-commit: ee5df765796cfbeade482652e4c5d928c82af6d1
Component: engine
2013-06-18 17:24:26 -07:00
Guillaume J. Charmes 61d11ddffb Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
Upstream-commit: 34a434616a7056a89328348ce3f92afd2730c777
Component: engine
2013-06-18 16:12:30 -07:00
Elias Probst 65fe379064 Use the canonical 'ip' commands to make it easier for new 'iproute2' users to understand the usage.
Upstream-commit: bc9b91e501369264966263fc28bb516e6048b7e5
Component: engine
2013-06-19 00:57:43 +02:00
Solomon Hykes 07df046233 Merge pull request #927 from dotcloud/nicer-build-output
* Builder: nicer output for 'docker build'
Upstream-commit: edbd3da33a02068cd48d4a862071f429c0d05329
Component: engine
2013-06-18 15:48:00 -07:00
Guillaume J. Charmes 2c3eeb1b3d Merge pull request #918 from dotcloud/hisotry_lookup
Add image lookup to history command
Upstream-commit: 32e8f9beca4c8a0c0b3e32b8d7ea4366067c3913
Component: engine
2013-06-18 15:36:05 -07:00
Guillaume J. Charmes 0c8eff63fa Update documentaiton
Upstream-commit: 84ceeaa8708293de81765a0f854952a74d191024
Component: engine
2013-06-18 14:36:35 -07:00
Solomon Hykes 781a7a3216 Fix incorrect docs for 'docker build'
Upstream-commit: c0b82bd807000019674e1f939b9ee2f43e5ba518
Component: engine
2013-06-18 12:52:37 -07:00
Guillaume J. Charmes 017e4a61cb Fix merge issue
Upstream-commit: 6e17cc45eabf6d094241fc3e017a90da8ba6f5d9
Component: engine
2013-06-18 12:33:06 -07:00
Elias Probst 3fe9ccaf5e Fixed #923 by replacing the usage of 'ifconfig' with 'ip a' where appropriate and added a note to use 'ip a' instead of 'ifconfig' for a screencast transscript.
Upstream-commit: c2e95997d4c4dda9edbb4adaab8920f1b5982c25
Component: engine
2013-06-18 19:55:59 +02:00
Guillaume J. Charmes 531f894fab * API: Send all tags on History API call
Upstream-commit: 808faa6371c470fa0765f5d4e3aed7708d8f9ee6
Component: engine
2013-06-18 10:31:07 -07:00
Andy Rothfusz 26a92f3da2 Merge pull request #921 from dhrp/docs-redirects-and-fixes
Fixes on documentation. LGTM
Upstream-commit: 702c3538a4f9dd251c27364f3511be19851f7784
Component: engine
2013-06-18 09:58:24 -07:00
Thatcher Peskens c44c8b06a4 Fixed on documentation.
* replaced previously removed concepts/containers and concepts/introcution by a redirect
* moved orphan index/varable to workingwiththerepository
* added favicon to the layout.html
* added redirect_home which is a http refresh redirect. It works like a 301 for google
* fixed an issue in the layout that would make it break when on small screens
Upstream-commit: 3491d7d2f11246ba4067708a3c5336ba21da4767
Component: engine
2013-06-17 20:16:56 -07:00
Guillaume J. Charmes 176d1b39a4 Update documentation
Upstream-commit: 02a002d264faa7b8cdf5c68b7370c31d6794a44d
Component: engine
2013-06-17 18:41:13 -07:00
Guillaume J. Charmes 0b3b002cd4 Merge branch 'master' into builder_server-3
Conflicts:
	buildfile_test.go
Upstream-commit: 555552340dd07eb446e54011071a621430fd83a0
Component: engine
2013-06-17 14:01:32 -07:00
Solomon Hykes 569fd3d92a Merge pull request #911 from dotcloud/add_port_redirection_doc
* Documentation: add port redirection doc
Upstream-commit: 6e2c32eb9a86c65c55d9097e58a5ad5c9a950e66
Component: engine
2013-06-17 13:57:08 -07:00
Solomon Hykes 00898589d5 Typo
Upstream-commit: cb58e63fc54fb3f1c620c8372269a8e308e43bee
Component: engine
2013-06-17 14:28:04 -06:00
Solomon Hykes cafa9cc449 Added content to port redirect doc
Upstream-commit: 862659875335c953bf6974af4cace397c7ec3902
Component: engine
2013-06-17 13:25:50 -07:00