Commit Graph

753 Commits

Author SHA1 Message Date
d03901e0ad Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user
Upstream-commit: 01fea3cf116b768720b542ab65cbd1c2695848d0
Component: engine
2013-11-08 09:32:13 +10:00
80db89881c Fix bold
Upstream-commit: 9990db2f5a762fdbc198cbfc5e96370d859739bb
Component: engine
2013-11-06 18:07:55 -08:00
9970f516fc updated create, showing how to set expose port and bind to public port for ssh
Upstream-commit: 2d1155407a6e24b595d2627af6fa9f9f702483d2
Component: engine
2013-11-06 18:07:55 -08:00
d4449d4111 Merge pull request #2557 from jamtur01/new_redis
Updated Redis service example to use links. Removed "Linking Redis" example as redundant.
Upstream-commit: 37dcff0c13c6e4ee71b22b7e4902c2e4b4b88132
Component: engine
2013-11-06 17:54:34 -08:00
493375c769 Merge pull request #2567 from mck-/patch-1
Add -p when running the container (node example)
Upstream-commit: 38f1838e821822037f334dc4aee1da9a3c76c53c
Component: engine
2013-11-06 17:34:11 -08:00
85bf6b92cb updating cli help doc for images
Upstream-commit: 363738b8f21d02c2e4fac84bd2776c2d4a5e6755
Component: engine
2013-11-06 12:03:45 -08:00
143de969f1 fix /images/json doc for 1.7
Upstream-commit: 16eba6bbb514fb4082e6779e175a29698a6734ce
Component: engine
2013-11-06 11:30:04 -08:00
c0461f4ee4 Add -p when running the container
Without it, docker was not mapping/exposing the private port

Docker version 0.6.5, build 3ff8459
Upstream-commit: 3108f0526ef25596c7f6f545b07c95d90e966a7d
Component: engine
2013-11-05 20:48:16 -08:00
2e403649d0 update "images" documentation
Upstream-commit: 6d5b73c2a6d668b11d6b5c643a45170265bf73c0
Component: engine
2013-11-06 04:23:07 +00:00
bbfaa00404 Merge pull request #2562 from tchaudhri/patch-1
(doc) Update ubuntulinux.rst
Upstream-commit: 980eda4c25c2221127f93b7b5194e372a29be197
Component: engine
2013-11-05 14:52:07 -08:00
8a1dabb05a Merge pull request #2423 from rogaha/volumes_doc
Added volumes documentation
Upstream-commit: bf05eb8ac0a8c919131c9c640e52b73387b9a1e0
Component: engine
2013-11-05 14:38:28 -08:00
8da2c74ae5 Removed redundant linking example
Upstream-commit: e88368b34cab8d4b7d5a1179cdd25fc9cd2b3d79
Component: engine
2013-11-05 14:28:57 -06:00
7eaaa6080e (doc) Update ubuntulinux.rst
small grammar changes - hopefully not worse than original :)
Upstream-commit: 4d5ecdbeb4e428d92c5a0089378f7bae9b3ca3d9
Component: engine
2013-11-05 12:08:56 -07:00
d216ad8055 Merge pull request #2559 from pattichen/master
Fix typo
Upstream-commit: 714acf5ade98c4a3ec4069390b8cd66107347ab9
Component: engine
2013-11-05 10:30:15 -08:00
b64b038b00 Merge pull request #2460 from SvenDowideit/2294-use-repo-colon-tag-everywhere
covert docker (commit|import|tag) to use REPOSITORY[:TAG]
Upstream-commit: 962a66cd36a615bb0a7cb9866becdccf4aa97839
Component: engine
2013-11-05 10:29:54 -08:00
b09631ee21 Fix typo
Upstream-commit: 2cac81393715e6a748b3a2316d5163604497b26c
Component: engine
2013-11-04 22:36:57 -08:00
14d0aebe52 Updated Redis service example to use links
Upstream-commit: 1182797c6d6bf4bb87e5edcddd75edb3f995dac0
Component: engine
2013-11-04 19:18:37 -06:00
22e1fc60ec Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
Update docker search to reflect future changes of the api
Upstream-commit: a482bfd715c6c33603ee5fbdc27693c942dbef93
Component: engine
2013-11-04 16:14:14 -08:00
b6ee1ce3fa - Removed some unconfirmed info
- Added reference to the index.rst
Upstream-commit: 3061e9f37434fa6bb0714861119ae01d8c4b35fb
Component: engine
2013-11-04 13:16:51 -08:00
801c058dee Merge pull request #2534 from jamtur01/examples_fixes
A variety of syntax and style fixes for the Docker examples
Upstream-commit: 19ad299600ff9acddc7baf1a97deab231c669f50
Component: engine
2013-11-04 12:35:57 -08:00
00be4ae87e Merge pull request #2533 from jamtur01/add_sudo
Some format and syntax changes.
Upstream-commit: dc333878d2337684466f0241d19bccf3a4fad4b5
Component: engine
2013-11-04 11:24:51 -08:00
8c3f937eb2 conert docker (commit|import|tag) to use REPOSITORY[:TAG] (and repove support for REPOSITORY TAG)
Upstream-commit: 1f3cdc11ee0c7088c8619f8b31bcd17ce8b79b79
Component: engine
2013-11-04 22:07:55 +10:00
c9ed212566 A variety of syntax and style fixes for the Docker examples
* Made Docker a proper noun when needed.
* Fixed code syntax
* Fixed some whitespace issues
* Fixed some typos and grammar
* Tidied up some examples
Upstream-commit: 1cb4557cc8e40f509898bded6684a45070fbb2a4
Component: engine
2013-11-02 18:26:52 -07:00
beba024082 Some format and syntax changes.
* Added sudo as per convention to docker commands
* Break the Dockerfile block up
* Redis is a proper noun
* Minor whitespace fixes
Upstream-commit: c33d26a8da0dc2dd33918bc5e21283dd62f6d755
Component: engine
2013-11-02 17:53:44 -07:00
cbce82a91e Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
RemoteAPI: Do not split last column docker top
Upstream-commit: 8f27e23b4b28406e7cde47ea74d56232c935208c
Component: engine
2013-11-01 15:21:47 -07:00
ff81045ced Merge pull request #2497 from dotcloud/jpetazzo-escape-apparmor-confinement
Runtime: escape apparmor confinement
Upstream-commit: d8bcd1c2315f6487fbd3b2b534fcb318ecbdce2c
Component: engine
2013-11-01 15:07:54 -07:00
f207545b43 Fixed 127.0.0.0 typo in cli.rst
Upstream-commit: dcf4633e95c7f3784cb29b9c1f9510af28b882ed
Component: engine
2013-11-01 14:00:02 -07:00
8cac740175 Merge pull request #2510 from GrilloPress/patch-1
Update windows.rst
Upstream-commit: b30dc8c3eaa9f393f44fb8544cd40eb9458e0dbe
Component: engine
2013-11-01 13:56:23 -07:00
cfe12c9c5b Merge pull request #2512 from dudebout/correct-basics-doc
Corrects the TCP section of the basics use
Upstream-commit: feef16bd88c249e8725da85a491c37d7bf2086e3
Component: engine
2013-11-01 13:55:28 -07:00
5e4f415366 Refactor HostConfig and escape apparmor confinement
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
e048f744ba Merge pull request #2479 from dudebout/port-redirection-doc
Port redirection doc
Upstream-commit: 33d8c736fcc0e7fcd18c60ad849caf7e30090755
Component: engine
2013-11-01 13:43:53 -07:00
5287e87035 Merge pull request #2492 from dotcloud/publish-all-flag
Add -P flag to publish all exposed ports
Upstream-commit: 65ba2868d7e0084f5edd2fc836d032f39ec39b9a
Component: engine
2013-11-01 10:21:02 -07:00
c0c39b7770 Rework the port direction documentation
+ remove PUBLIC and PRIVATE keywords
+ add the <host_interface>
+ add the -expose flag through a simple link example
+ update the meaning of the EXPOSE command
Upstream-commit: c0e51a8f27defe3d4dde0b5805d3801cf25a6ce2
Component: engine
2013-11-01 12:18:04 -04:00
84bc916ae3 Corrects the TCP section of the basics use
Upstream-commit: f2ebccb5aab6600094d92bdb6d4a8ab62bb519d2
Component: engine
2013-11-01 12:14:43 -04:00
c444529939 Update windows.rst
Added further information regarding how to access BIOS menus on Windows machines (laptops). My laptop required restarting to find the options and this information will undoubtedly help other users.
Upstream-commit: db2e2e831ba45f173591766160699ec0b0c77f0d
Component: engine
2013-11-01 13:59:25 +00:00
47ebac600d rebase and add some filters
Upstream-commit: 747967b4a4e2bfa429a76d20db77b990d23b1a0f
Component: engine
2013-10-31 19:25:55 -07:00
fefd04077b Merge pull request #2482 from elee/patch-1
correct assignment of $PORT from docker port output
Upstream-commit: d5891f9fb08d8366dc213465e105ed2e3036b264
Component: engine
2013-10-31 12:18:24 -07:00
f1d3f730e4 Merge pull request #2475 from dudebout/patch-2
Fixes the password value in the redis/links example
Upstream-commit: 09607bb8f68e6fe45c90514c6acd13d0a6e7087b
Component: engine
2013-10-31 12:17:43 -07:00
f28b4da1c3 Merge pull request #2477 from dudebout/patch-3
Fixes typo in the CLI documentation
Upstream-commit: 35044efce55bb07b7309f10129c91bcc14cb513a
Component: engine
2013-10-31 12:17:06 -07:00
44da76a732 Add -P flag to publish all exposed ports
Upstream-commit: 652f07bb59e9c46d5f3e375c4a99d0b23771e0ad
Component: engine
2013-10-31 11:28:30 -07:00
76a46c89b0 Merge pull request #2462 from tlunter/fix_remote_api_doc
Fix formatting on build-an-image-from-dockerfile-via-stdin
Upstream-commit: 54024ddd8a38881be173eb3124c4019e4ce381ea
Component: engine
2013-10-31 10:56:38 -07:00
73541bce08 Fixes another instant of the password
Upstream-commit: 7e7c931d2b6d667ed97957df37e26b49888933c1
Component: engine
2013-10-31 08:55:14 -04:00
bf5d4694b4 Fixed the quoted text
Upstream-commit: 3a14d4c923109b93ba805e661fa1573c3b2f9db7
Component: engine
2013-10-31 08:46:16 -04:00
02e12e8500 correct assignment of $PORT from docker port output
in the example, PORT is assigned to "0.0.0.0:<port>" vs "<port>" as in previous versions of docker (I encountered this documentation discrepancy tonight after installing docker v0.6.5)
Upstream-commit: df1621914b56b4ed20f684363247a9bb0c7acebf
Component: engine
2013-10-31 01:08:16 -04:00
17e208649c Fix typo
Upstream-commit: f77bbfca56e45b4cb405ecb5f2c950c294375b59
Component: engine
2013-10-31 00:07:58 -05:00
3c41e18387 Fixes typo in the CLI documentation
Upstream-commit: 87a250b71186547312dc7b5f6960aae485a465cd
Component: engine
2013-10-30 23:09:02 -04:00
5dfb155fe5 Fixes the password value in the redis/links example
Upstream-commit: ccc1a5dcfb78de8718df08db9e09ea17d9723a16
Component: engine
2013-10-30 22:52:47 -04:00
1e48612a2b Merge pull request #2470 from metalivedev/2369-docuncompress
Documenting decompression behavior.
Upstream-commit: c1c65f972a0db81be9415c330493e7d76d3a6501
Component: engine
2013-10-30 19:14:51 -07:00
a162db7be1 Merge pull request #2432 from SvenDowideit/doc-stop-kill-details
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
Upstream-commit: 4b8a176ee0f5df3d7f29f7995f38c700330468b1
Component: engine
2013-10-30 18:57:07 -07:00
67b88fd430 Add flags to history, add size flag
Upstream-commit: 1099d172a2f083c456c3564d403e666e965a9544
Component: engine
2013-10-30 19:41:20 -05:00