abd8707658
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid
...
Server: always return long id's
Upstream-commit: 87c8437a900e683547278fcdd92de71ed8a866e3
Component: engine
2013-11-11 13:06:19 -08:00
846d1113e1
Merge pull request #2313 from wazboy/master
...
Vagrant AWS update
Upstream-commit: 6fab249b21a2555f58c4de468f1f63bb284dc021
Component: engine
2013-11-11 13:01:20 -08:00
fac387b017
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
...
Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f
Component: engine
2013-11-11 12:34:16 -08:00
ae06d51230
Merge pull request #2630 from jamtur01/api_status
...
Added status column to API client table
Upstream-commit: 9ff36cb00c3b25971ca626cf8ad227822b05a798
Component: engine
2013-11-11 11:56:04 -08:00
0d32d7f5f1
Merge pull request #2574 from crosbymichael/api-port-changes
...
Update documentation to reflect changes in Config and HostConfig
Upstream-commit: 1d9139bb890667fcd437a7316d2ff1b9a41dc250
Component: engine
2013-11-11 09:59:48 -08:00
ab0419261e
Vagrantfile updates.
...
- Remove the overrides config.vm.box and config.vm.box_url and use
the same values for all providers.
- Use the same private key path for all providers. It is still possible
to set a different private key path through the environment variable
SSH_PRIVKEY_PATH if desired (your AWS key may be different from your
Virtualbox key).
- Allow the environment variable AWS_INSTANCE_TYPE to specify the
instance type of instead of hard coding the AWS instance type as
't1.micro'. 't1.micro' is still the default if unspecified.
- Use the same environment variables for keys as the Amazon provided EC2
API tools. This allows people who already have the EC2 tools set up
correctly to use 'vagrant up' with less environment configuration
than before.
- Rewrite the provisioning code. The goal is to be idempotent and to
correctly install docker for all providers instead of just virtualbox.
It will conditionally install the virtualbox guest additions if
virtualbox is the provider.
- Update the AWS install documentation to reflect the changes.
Upstream-commit: ccbb5d34927dc1905984bead3ebb576c0ea20960
Component: engine
2013-11-10 23:39:26 -08:00
a33628fd7c
Added status column to API client table
...
Upstream-commit: 5a1bfd9aa9a0983b5141dd8e393cc67a68fc6590
Component: engine
2013-11-10 12:14:45 -05:00
d772cfe673
make all image ID and container ID API responses use the Long ID ( Closes #2098 )
...
Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2
Component: engine
2013-11-09 12:16:49 +10:00
90f6287bc3
Fix 2585, rebase to master
...
Upstream-commit: 34d294c4615855dca1ff2399f9bed63885b33786
Component: engine
2013-11-08 15:15:45 -08:00
08ddb7c17c
Merge pull request #2526 from metalivedev/2074-AddKnownIssues
...
Add Known Issue
Upstream-commit: 67b0b97a8f17c67e5599f4566c8a9e1a5bb401fe
Component: engine
2013-11-08 12:14:04 -08:00
2f4c3fdf6d
Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from
...
Upstream-commit: f417c4b09955e3b250bec19a0d4b13ff30ba4e80
Component: engine
2013-11-07 17:59:55 -08:00
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
9fe27fc825
Fix 2585 and clean up warning in contributing.rst
...
Upstream-commit: 97c3de7e6b92b13efa30c5c840ce2fab07b8794e
Component: engine
2013-11-07 12:20:23 -08: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
a135b385fd
Update documentation to reflect changes in Config and HostConfig
...
Upstream-commit: 70f44d5531a5c6dcb96b7e608a96beb52e93b506
Component: engine
2013-11-06 10:01:58 -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
6c362cebcc
Add ability to mount volumes in readonly mode using -volumes-from
...
Upstream-commit: f9cb6ae46a3478c19e85a2a159c4ac31223ec499
Component: engine
2013-11-05 11:58:51 -06: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
938714910e
Add known issues. Fix build warnings.
...
Upstream-commit: 5a9adfe9fb5bc988185ef41ca637fbeee73e947c
Component: engine
2013-11-01 16:06:46 -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
adc686474c
Add known issues to sections via new "issues" extension.
...
Upstream-commit: 4194617bfe1e29bae2c2515aefbed5f1f2a1ebc1
Component: engine
2013-11-01 15:15:06 -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
