1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

50 Commits

Author SHA1 Message Date
Guillaume J. Charmes
dc88351021 Make sure ADD will create everything in 0755
Upstream-commit: f7542664e3efb35b6b153dc2b2cc9cdac181989a
Component: engine
2013-07-29 11:03:09 -07:00
Victor Vieux
8aa1b36505 Merge pull request #1241 from ryfow/patch-1
Make the ENTRYPOINT example work
Upstream-commit: dfc64d157a2a8c387b56a3eea501c726a93f41d0
Component: engine
2013-07-23 08:45:04 -07:00
Thatcher Peskens
fab05b9aee Added new docker logo to the documentation header, and added other links.
Upstream-commit: 58a1c5720a42fde72c27532ce1122609225bc3bb
Component: engine
2013-07-22 20:26:40 -07:00
Caleb Spare
e3ecb715a3 Update ADD documentation to specify new behavior.
Upstream-commit: c383d598809daec6bccd60bd211c10f6a4ef60b0
Component: engine
2013-07-21 23:32:06 -07:00
Caleb Spare
ed8e1bd7e6 Remove some trailing whitespace.
Upstream-commit: 416fdaa3d5d7b84f7e36fdfcff7153e3a38262c9
Component: engine
2013-07-21 23:32:06 -07:00
Ryan Fowler
1ef21555e9 Make the ENTRYPOINT example work
The incantation listed in the ENTRYPOINT example didn't actually pass the arguments to your script. Changing the definition to an array fixes this.
Upstream-commit: e8ad82f9ba126414e1813fadfb17167a34afa8d4
Component: engine
2013-07-19 10:11:21 -05:00
Andy Rothfusz
7bd70e19f4 Make docs build without warnings or errors. Minor additional cleanup.
Upstream-commit: 54f9cdb0c30ef7d192c4ae59c669a7a5fd7d1003
Component: engine
2013-07-18 19:04:51 -07:00
Andy Rothfusz
97e62e30e8 Make dockerfile docs easier to find. Clean up formatting.
Upstream-commit: aa5671411b727d7142c289b5c1b473209aeaf630
Component: engine
2013-07-17 18:56:40 -07:00
Andy Rothfusz
2953a9d955 Update repository information.
Upstream-commit: 0356081c0ad2f1d95fb435f9a491f7a7a63cbf33
Component: engine
2013-07-16 17:04:41 -07:00
Michael Crosby
6a215f8175 Fix Docker Builder documentation numbering
Upstream-commit: 90483dc9123d6cb9eb1aa1bf4ba4e851d751784e
Component: engine
2013-07-11 16:41:19 -09:00
Michael Crosby
7935041f18 Add VOLUME instruction to buildfile
Upstream-commit: eb9fef2c424178277cacd29d404cc8e774bb3891
Component: engine
2013-07-10 06:59:16 -09:00
Andy Rothfusz
92fbe05ddb Cleaning up the welcome page, terminology, and images.
Upstream-commit: ff964d327d030221b4e65661cee0ee0826bcdb32
Component: engine
2013-07-02 15:03:29 -07:00
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
Guillaume J. Charmes
7ab6c2d54d Remove deprecated INSERT from documentation
Upstream-commit: 169ef21de768a45805f2afc56b3e5c6f21130b92
Component: engine
2013-06-21 14:12:52 -07: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
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
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
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
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
Solomon Hykes
781a7a3216 Fix incorrect docs for 'docker build'
Upstream-commit: c0b82bd807000019674e1f939b9ee2f43e5ba518
Component: engine
2013-06-18 12:52:37 -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
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
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
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
Victor Vieux
5e2d23d571 add port redirection doc
Upstream-commit: 36231345f17e6fdb08b0f756c4872294d4745048
Component: engine
2013-06-17 22:05:58 +02:00
Guillaume J. Charmes
18df81b8e1 Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
	commands.go
	docs/sources/api/docker_remote_api.rst
Upstream-commit: 4b4918f2a78c129c4ca745147fd38f985d2635c2
Component: engine
2013-06-13 18:11:22 -07:00
Guillaume J. Charmes
a1c85f2f28 Merge pull request #855 from samjsharpe/fix_missing_hyphen
Build from Dockerfile on stdin requires a hyphen
Upstream-commit: 956491f8534692f7e31cd4678b688678d6256414
Component: engine
2013-06-07 13:04:27 -07:00
Sam J Sharpe
f164baea45 Build from Dockerfile on stdin requires a hypen
There is a missing hypen in the documentation:
    `docker build < Dockerfile` will complain
    `docker build - < Dockerfile` will not complain
Upstream-commit: 5e6cd21f8b3bded9e9cba2e1b9a754df5a9c2bf2
Component: engine
2013-06-07 20:35:34 +01:00
Guillaume J. Charmes
f2a91760de Update documentation for docker build
Upstream-commit: 2cc22de696d5a0847ecd7d07eaee1d7f385dd29c
Component: engine
2013-06-06 16:48:36 -07:00
Daniel Gasienica
657224f8b4 Use code blocks
Upstream-commit: 4fb9a6eafb981ed66fe547fe29c11525f40d0640
Component: engine
2013-06-01 22:03:41 -07:00
Daniel Gasienica
74278bf53f Use title case for consistency
Upstream-commit: 2935ca7ee2879723c786b86ee87cc1be26dad7b8
Component: engine
2013-06-01 22:03:12 -07:00
Guillaume J. Charmes
cbcfc9c00c Update docker build docs
Upstream-commit: d97fff60a9275324290bb01b921c9b6b0967a4fd
Component: engine
2013-05-29 11:50:49 -07:00
Thatcher Peskens
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
Victor Vieux
1cfe074da1 use -H
Upstream-commit: 92e4a51965ce862ad1b4682a68b33550f2fd613f
Component: engine
2013-05-24 16:49:18 +00:00
Victor Vieux
aa6ea9bb08 bump to master
Upstream-commit: 9ebfcc9a152b9e00b166a0d4fb385b61e8330607
Component: engine
2013-05-24 12:17:44 +00:00
Victor Vieux
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
Thatcher
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
rogaha
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
Victor Vieux
c981be44f5 improved doc and usage
Upstream-commit: 800b401f0ba706f8f09b5beacd335caf4548e63c
Component: engine
2013-05-22 16:15:52 +00:00
Guillaume J. Charmes
838989cd24 Update docker builder doc
Upstream-commit: 218812eb3cfeb5c5253ed6a54ed3e45c1107ffd1
Component: engine
2013-05-20 17:52:39 -07:00
Gareth Rushgrove
b8a2af00ca add instructions for using docker with puppet
Upstream-commit: 55dd0afb5dd365bd306f698f9ccca1425e5c91a7
Component: engine
2013-05-17 17:08:37 +01:00
Thatcher Peskens
6cef827145 Merge remote-tracking branch 'dotcloud/master' into clean-reshuffle
Upstream-commit: 097531d8532d778faacac29ce6ff6c5b2766c473
Component: engine
2013-05-13 11:12:19 -07:00
Thatcher Peskens
0e4b996e2f Major rearrange of the documentation.
Upstream-commit: 7557af19d8cc3fba858b3ab67cef4875b6097c42
Component: engine
2013-05-10 12:00:12 -07:00