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
Victor Vieux
5e2d23d571
add port redirection doc
...
Upstream-commit: 36231345f17e6fdb08b0f756c4872294d4745048
Component: engine
2013-06-17 22:05:58 +02:00
Guillaume J. Charmes
726da1690f
Merge branch 'master' into builder_server-3
...
Conflicts:
utils/utils.go
Upstream-commit: 78f86ea502694bf5dbc947802ebc0f5e5426d15c
Component: engine
2013-06-14 17:08:39 -07:00
Guillaume J. Charmes
d233a440c6
Merge branch 'master' into remove_bsdtar
...
Conflicts:
docs/sources/contributing/devenvironment.rst
Upstream-commit: abf85b25085b52e19f774dc30bd87527b3295f2a
Component: engine
2013-06-14 14:34:30 -07:00
Andy Rothfusz
4bc27f700a
Add examples for local import.
...
Upstream-commit: 7958f1f694ac411dcfeb8fbf0d702a7c552306ae
Component: engine
2013-06-14 13:42:59 -06:00
Guillaume J. Charmes
71762e1ba0
Merge pull request #816 from unclejack/524-fix_aufs_links_related_warnings
...
524 fix aufs links related warnings
Upstream-commit: 4a02c6dab1c3ba798370a64baa8bd94fa6f89c11
Component: engine
2013-06-14 12:32:47 -07:00
unclejack
1d89b8f78f
add aufs-tools package to dev env docs page
...
Upstream-commit: fb7eaf67d1c01eea28fcbed61d6d8abd8117c965
Component: engine
2013-06-14 21:41:12 +03:00
Guillaume J. Charmes
f73437e29d
Update docs
...
Upstream-commit: 79fe864d9a117193b4dce8b7fe156a55bbadcce6
Component: engine
2013-06-14 10:58:16 -07:00
Victor Vieux
2a4a4027de
update docs, remove config file on 401
...
Upstream-commit: 90f6bdd6e41ec352009ffbd073c1f45983abb74b
Component: engine
2013-06-14 13:38:51 +00:00
Victor Vieux
b78bf5bb71
update docs
...
Upstream-commit: e49f82b9e1a920c902c1cd813596dc1a78817e63
Component: engine
2013-06-14 10:10:26 +00: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
Victor Vieux
4147a474f5
rebase master
...
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00
Solomon Hykes
9efccead8d
Merge branch '610-improve_rmi-feature'
...
* Runtime: improved image removal to garbage-collect unreferenced parents
- Runtime: fixed image removal to cleanly remove tags and repositories
Upstream-commit: 5ecfe13be9f8f47e27e5134e60d14d195a1baeaa
Component: engine
2013-06-12 20:30:07 -07:00
Andy Rothfusz
3f42298556
Merge pull request #845 from unclejack/841-update_docs_no_add_without_context
...
841 - docs: warn about the transmission of data to the docker daemon & ADD without context
Upstream-commit: 48897b5fa1e1cae157e484a465a696520f9106d3
Component: engine
2013-06-12 14:25:44 -07:00
Victor Vieux
0a236e493a
bump to master
...
Upstream-commit: f2383151cbcc727450f87cb80a392e2858d4b0ca
Component: engine
2013-06-12 17:39:32 +00:00
Solomon Hykes
3ff2998841
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: b4565af25657aa28d1cc9c740c82700c5ec6ce8b
Component: engine
2013-06-12 10:23:14 -07:00
Solomon Hykes
2ebddf1907
Merge pull request #853 from kencochrane/registry-api-1.1-fix
...
* Documentation: separate the registry and index API's into their own docs
Upstream-commit: 092c761cec2e89f73c3810ff8f2f4ffb01db53b0
Component: engine
2013-06-11 18:34:10 -07:00
Solomon Hykes
040fa0beff
Added a readme explaining the role of each API
...
Upstream-commit: d64f105b44d202aeb83a5f4edbdffdf2375992fa
Component: engine
2013-06-11 10:39:02 -07:00
Victor Vieux
604adb2ef8
* Remote Api: Add flag to enable cross domain requests
...
Upstream-commit: 20bf0e00e81fdff34c821fd880a92e822fb5ba15
Component: engine
2013-06-11 10:12:36 +00:00
Andy Rothfusz
ec363b1d2d
Add links to libraries, fix #800
...
Upstream-commit: ca4597e9d74474e4211cee9bf48513643a28fdf9
Component: engine
2013-06-10 15:22:34 -07:00
Andy Rothfusz
b4019d7d98
Add list of Docker Remote API Client Libraries. Fixes #800 .
...
Upstream-commit: eeea9ac9468a73bb9514a2d729060889b48384ee
Component: engine
2013-06-10 15:17:27 -07:00
Victor Vieux
6b64f66055
Merge pull request #869 from fsouza/fix-api-docs
...
docs/api/remote: fix rst syntax in the "Search images" section
Upstream-commit: bcc4754dc14037224517e874acd36244953a705b
Component: engine
2013-06-10 14:21:39 -07:00
Victor Vieux
2bcee3140c
rebump
...
Upstream-commit: 66d9a733622ba9a8f9671bac7d33776981672940
Component: engine
2013-06-10 21:05:54 +00:00
Andy Rothfusz
032df4df5a
Merge pull request #840 from dhrp/just-fixed-some-links
...
Fixed some links. Closes #839 #838 #835
Upstream-commit: 5712e37437ffcfbb17d75f7f9c977bf1d4013042
Component: engine
2013-06-10 13:51:43 -07:00
Francisco Souza
49bbfc9be5
docs/api/remote: fix rst syntax in the "Search images" section
...
Upstream-commit: b1ed75078ea04de8725ce5c39ae3b463f86faf4e
Component: engine
2013-06-10 16:07:57 -03:00
Guillaume J. Charmes
6bcd65ddd0
Fix typo in docs
...
Upstream-commit: 8984aef8999509e5e6a1cb70286e44d0508f93e0
Component: engine
2013-06-10 09:32:31 -07:00