Commit Graph
3761 Commits
Author SHA1 Message Date
Solomon Hykes 507ea757a5 * Builder: correct the behavior of ADD when copying directories. 2013-06-19 14:26:11 -07:00
Solomon Hykes a056f1deec Merge pull request #924 from eliasp/remove-ifconfig-usage
* Documentation: replace `ifconfig` in docs with `iproute`
2013-06-19 13:20:35 -07:00
Solomon Hykes b368d21568 Merge branch 'master' into fix-add-behavior 2013-06-19 10:31:50 -07:00
Victor Vieux d52af3f58f Merge branch 'master' into add_unix_socket-feature 2013-06-19 12:49:27 +00:00
Victor Vieux 063c838c92 update docs 2013-06-19 12:48:50 +00:00
Solomon Hykes 5be7b9af3e * Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented. 2013-06-18 20:28:49 -07:00
Andy Rothfusz 5183399f50 Added multilayer example image. 2013-06-18 19:31:35 -07:00
Andy Rothfusz a780b7c6b5 New Terminology section and illustrations. 2013-06-18 19:31:35 -07:00
Guillaume J. Charmes ee5df76579 Merge pull request #885 from dotcloud/remove_bsdtar
* Runtime: Remove bsdtar dependency
2013-06-18 17:24:26 -07:00
Guillaume J. Charmes 34a434616a Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
2013-06-18 16:12:30 -07:00
Elias Probst bc9b91e501 Use the canonical 'ip' commands to make it easier for new 'iproute2' users to understand the usage. 2013-06-19 00:57:43 +02:00
Solomon Hykes edbd3da33a Merge pull request #927 from dotcloud/nicer-build-output
* Builder: nicer output for 'docker build'
2013-06-18 15:48:00 -07:00
Guillaume J. Charmes 32e8f9beca Merge pull request #918 from dotcloud/hisotry_lookup
Add image lookup to history command
2013-06-18 15:36:05 -07:00
Guillaume J. Charmes 84ceeaa870 Update documentaiton 2013-06-18 14:36:35 -07:00
Solomon Hykes c0b82bd807 Fix incorrect docs for 'docker build' 2013-06-18 12:52:37 -07:00
Guillaume J. Charmes 6e17cc45ea Fix merge issue 2013-06-18 12:33:06 -07:00
Elias Probst c2e95997d4 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. 2013-06-18 19:55:59 +02:00
Guillaume J. Charmes 808faa6371 * API: Send all tags on History API call 2013-06-18 10:31:07 -07:00
Andy Rothfusz 702c3538a4 Merge pull request #921 from dhrp/docs-redirects-and-fixes
Fixes on documentation. LGTM
2013-06-18 09:58:24 -07:00
Thatcher Peskens 3491d7d2f1 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
2013-06-17 20:16:56 -07:00
Guillaume J. Charmes 02a002d264 Update documentation 2013-06-17 18:41:13 -07:00
Guillaume J. Charmes 555552340d Merge branch 'master' into builder_server-3
Conflicts:
	buildfile_test.go
2013-06-17 14:01:32 -07:00
Solomon Hykes 6e2c32eb9a Merge pull request #911 from dotcloud/add_port_redirection_doc
* Documentation: add port redirection doc
2013-06-17 13:57:08 -07:00
Solomon Hykes cb58e63fc5 Typo 2013-06-17 14:28:04 -06:00
Solomon Hykes 8626598753 Added content to port redirect doc 2013-06-17 13:25:50 -07:00
Victor Vieux 36231345f1 add port redirection doc 2013-06-17 22:05:58 +02:00
Guillaume J. Charmes 78f86ea502 Merge branch 'master' into builder_server-3
Conflicts:
	utils/utils.go
2013-06-14 17:08:39 -07:00
Guillaume J. Charmes abf85b2508 Merge branch 'master' into remove_bsdtar
Conflicts:
	docs/sources/contributing/devenvironment.rst
2013-06-14 14:34:30 -07:00
Andy Rothfusz 7958f1f694 Add examples for local import. 2013-06-14 13:42:59 -06:00
Guillaume J. Charmes 4a02c6dab1 Merge pull request #816 from unclejack/524-fix_aufs_links_related_warnings
524 fix aufs links related warnings
2013-06-14 12:32:47 -07:00
unclejack fb7eaf67d1 add aufs-tools package to dev env docs page 2013-06-14 21:41:12 +03:00
Guillaume J. Charmes 79fe864d9a Update docs 2013-06-14 10:58:16 -07:00
Victor Vieux 90f6bdd6e4 update docs, remove config file on 401 2013-06-14 13:38:51 +00:00
Victor Vieux e49f82b9e1 update docs 2013-06-14 10:10:26 +00:00
Guillaume J. Charmes 4b4918f2a7 Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
	commands.go
	docs/sources/api/docker_remote_api.rst
2013-06-13 18:11:22 -07:00
Victor Vieux c46382ba29 rebase master 2013-06-13 17:58:06 +00:00
Solomon Hykes 5ecfe13be9 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
2013-06-12 20:30:07 -07:00
Andy Rothfusz 48897b5fa1 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
2013-06-12 14:25:44 -07:00
Victor Vieux f2383151cb bump to master 2013-06-12 17:39:32 +00:00
Solomon Hykes b4565af256 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-06-12 10:23:14 -07:00
Solomon Hykes 092c761cec Merge pull request #853 from kencochrane/registry-api-1.1-fix
* Documentation: separate the registry and index API's into their own docs
2013-06-11 18:34:10 -07:00
Solomon Hykes d64f105b44 Added a readme explaining the role of each API 2013-06-11 10:39:02 -07:00
Victor Vieux 20bf0e00e8 * Remote Api: Add flag to enable cross domain requests 2013-06-11 10:12:36 +00:00
Andy Rothfusz ca4597e9d7 Add links to libraries, fix #800 2013-06-10 15:22:34 -07:00
Andy Rothfusz eeea9ac946 Add list of Docker Remote API Client Libraries. Fixes #800. 2013-06-10 15:17:27 -07:00
Victor Vieux bcc4754dc1 Merge pull request #869 from fsouza/fix-api-docs
docs/api/remote: fix rst syntax in the "Search images" section
2013-06-10 14:21:39 -07:00
Victor Vieux 66d9a73362 rebump 2013-06-10 21:05:54 +00:00
Andy Rothfusz 5712e37437 Merge pull request #840 from dhrp/just-fixed-some-links
Fixed some links. Closes #839 #838 #835
2013-06-10 13:51:43 -07:00
Francisco Souza b1ed75078e docs/api/remote: fix rst syntax in the "Search images" section 2013-06-10 16:07:57 -03:00
Guillaume J. Charmes 8984aef899 Fix typo in docs 2013-06-10 09:32:31 -07:00