Commit Graph

100 Commits

Author SHA1 Message Date
c2f970187c Merge pull request #2709 from eugenkrizo/patch-1
path needs to be specified to 'docker build' command
Upstream-commit: e12bba66ea784e0c7859b5679d6a55d639889508
Component: engine
2013-11-15 13:34:08 -08:00
3c67b07093 port published explicitly (for docker 0.6.6)
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
Upstream-commit: 492ce4c665b7d55d1496fb7e822a49ff0d44809d
Component: engine
2013-11-15 17:12:48 +01:00
bc283849de path needs to be specified to 'docker build' command
current folder '.' appended as a path
Upstream-commit: 007964793dd619279bfb48c3fa84ada65aa599bd
Component: engine
2013-11-15 16:16:59 +01:00
172689d6bb fix error in python webapp example
When getting the private port used by a container using
`docker port` returns 0.0.0.0:49353, stript just the portnumber of the address with awk to used it in the rest of the example code.
Upstream-commit: f5e6c2d060d5eb052929c4ab14bf3256b260afc4
Component: engine
2013-11-13 13:20:38 +01: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
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
8da2c74ae5 Removed redundant linking example
Upstream-commit: e88368b34cab8d4b7d5a1179cdd25fc9cd2b3d79
Component: engine
2013-11-05 14:28:57 -06:00
14d0aebe52 Updated Redis service example to use links
Upstream-commit: 1182797c6d6bf4bb87e5edcddd75edb3f995dac0
Component: engine
2013-11-04 19:18:37 -06: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
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
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
73541bce08 Fixes another instant of the password
Upstream-commit: 7e7c931d2b6d667ed97957df37e26b49888933c1
Component: engine
2013-10-31 08:55:14 -04:00
17e208649c Fix typo
Upstream-commit: f77bbfca56e45b4cb405ecb5f2c950c294375b59
Component: engine
2013-10-31 00:07:58 -05:00
5dfb155fe5 Fixes the password value in the redis/links example
Upstream-commit: ccc1a5dcfb78de8718df08db9e09ea17d9723a16
Component: engine
2013-10-30 22:52:47 -04:00
4c6143c7d7 Update links and host integration documentation
Upstream-commit: a4d97a4e80d569181835b7d55348dc755f48ce25
Component: engine
2013-10-30 11:59:05 -07:00
39bb284f54 Expose IP, port, proto as sep. env vars when linking, Closes #2430
Upstream-commit: 1de23f1b81956bc04ba047d066ff7d84d9162910
Component: engine
2013-10-28 23:02:28 -07:00
7ce1e20657 Add -name for docker run
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
bdda0e729a fix typo in docs
Upstream-commit: 99a9783abcf5db6ead15228fcf7bc962fff548f5
Component: engine
2013-10-25 15:13:24 -07:00
f85e0d3aec Remove docker ls from docs and cli usage
Upstream-commit: 515070d5138c205e65cd029443c84408ad593ef6
Component: engine
2013-10-25 15:13:24 -07:00
952ac8a789 Add links for container relationships and introspection
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
ce87496ba9 Clean up build warnings. Remove redundant files.
Upstream-commit: 689bcd1dc3afdcae5bd45e32541b464fcf3ecbd0
Component: engine
2013-10-17 17:57:01 -07:00
2c8dcaacd9 Revert "Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example."
This reverts commit f4c17a202b5f6021d48c3cb3342c37607b509630.
Upstream-commit: dab84f7e8bc1647f70782731e797fd827c7ce42a
Component: engine
2013-10-16 14:38:24 -07:00
6de23da0ea Merge pull request #2160 from iffy/patch-1
Minor updates to postgresql_service.rst
Upstream-commit: 93b258413f07861cc3b57917fb102313881f4630
Component: engine
2013-10-14 11:59:57 -07:00
c24e35d823 Minor updates to postgresql_service.rst
I've added the steps that were missing/wrong for me when I went through this just now.
Upstream-commit: 9041d6a47bef475aa58bb47b38f49ac408fb94bf
Component: engine
2013-10-10 10:23:24 -06:00
068d644efe Corrected error in the package name
Upstream-commit: 152037f011de00cbe06069687024bc345c76b0c6
Component: engine
2013-10-10 10:10:33 +02:00
65b5bca147 Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example.
Upstream-commit: f4c17a202b5f6021d48c3cb3342c37607b509630
Component: engine
2013-10-08 17:33:19 -07:00
17c973c7fe Changes to a new style for the docs. Includes version switcher.
* added link to edit on GitHub
* Changed image source on homepage
* Made some changes to the structure, added the ability to have l3 navigation. Added warning, note and other styles.
* Fixed an image link, removed the .. :content: links because they were quicky and didn't look good, added pagelinks to current page of other versions.
* Moved the remote client api's to their own doc
Upstream-commit: e3e041b6bf0066fa5e65625694517ff387fee3b1
Component: engine
2013-09-27 19:54:52 -07:00
fb1ac0f2c2 revert removal of slash betwixt user/repo
Upstream-commit: c000e6a7fce11aaddae916853cc551d4801c1f8e
Component: engine
2013-09-24 15:51:21 -05:00
6fd51a9a7d use su instead of sudo
Upstream-commit: 17b7194d91ba91e044155edf7ae0a485c2dd9c0b
Component: engine
2013-09-24 02:25:16 -05:00
69887d2da0 various command fixes
Indicating the repository and tag should be separated by a space and not a '/'. Also fixed a quote typo.
Upstream-commit: 15ad2915b95bd13067691ed3c7dcab67f529d37f
Component: engine
2013-09-24 02:12:24 -05:00
0118da35aa Docs: remove reference to deprecated 'base' image
Upstream-commit: a18c26392ff7f4a756f499bd5c3032f2256cd04e
Component: engine
2013-09-19 10:25:30 -06:00
9c3ea618a8 Fix #1654 Improve the introduction to repositories flow.
Upstream-commit: 67453d6b481200ad487b87d5620ce93602939341
Component: engine
2013-09-17 19:01:11 -07:00
f3b949b816 Update hello_world.rst
Small typo
Upstream-commit: dfe45e1ad5fe741c379c5549c9ea56ec440d2579
Component: engine
2013-09-11 15:35:05 -04:00
3c51fffb9b Merge pull request #1835 from metalivedev/1821-exampleslanding
fix #1821 landing page for examples
Upstream-commit: de75241b627730a24e4db59ddb5bc06ba27bffac
Component: engine
2013-09-10 14:14:00 -07:00
9cb316385e Merge pull request #1773 from hectcastro/hc-riak-example
Add a Docker example for running Riak
Upstream-commit: 0508bd8da78af21fef74cb45993f60f188eeac39
Component: engine
2013-09-09 13:31:41 -07:00
122c44caef Created a little landing page for the examples, combined first two.
Upstream-commit: fe99e51634f7068ce997e9866516f2b14a93bda9
Component: engine
2013-09-09 13:19:07 -07:00
fe18d490b4 note about exiting from attachment prior to running
Upstream-commit: 9749d94fb0f3034247dbd969f6dad390f2605e1a
Component: engine
2013-09-09 10:30:06 -04:00
04edea7666 improve sentence readabilty
Upstream-commit: 630ae43e7d11fa34421a253c765edb6cef5a3371
Component: engine
2013-09-09 10:19:45 -04:00
b7cc10776d Add a Docker example for running Riak.
Upstream-commit: fac4cedcc105a7b5a6789917ddf9a5e9745bd2d3
Component: engine
2013-09-03 16:30:40 -04:00
a42573ca6a Update python_web_app.rst
Fixed typo in the WEB_PORT command, missing sudo in front of docker command
Upstream-commit: 559724ac35134ac3cced1159cf776b7ab7bdacc6
Component: engine
2013-08-30 00:37:47 +02:00
e74c0d800f Fix #1684: Old Welcome is now Introduction. Working with Repos now follows Builder.
Clean up some doc build errors. Removed old Manifesto. Tweaked layout javascript
to allow direct link from first and last index elements.
Upstream-commit: c627ff6e209ac1f660a49371d4f6bd710470aacb
Component: engine
2013-08-27 14:29:49 -07:00
a51df5a054 Merge pull request #1622 from TylerBrock/patch-2
Some fixes for MongoDB example
Upstream-commit: 5b84252c73ed0e6d3bf351099d73a4a69bacc60d
Component: engine
2013-08-26 17:28:38 -07:00
1a3985cf66 ENTRYPOINT fixups
Upstream-commit: f352ec945fbc34eafdde04dff7ced995c9e3a409
Component: engine
2013-08-26 19:17:26 -04:00
242a1e6f55 Don't force a non-existent npm version, use latest from epel
Not the smartest thing to do
Upstream-commit: 843ef645d2c76275e484e3fd5262b947d5611d59
Component: engine
2013-08-26 12:54:15 +03:00
8ed0b7d24b Some fixes for MongoDB example
Upstream-commit: d6f53049c4ec4513a136bfd512dafe166c4ad901
Component: engine
2013-08-21 23:48:32 -04:00
934a8f1946 Add mongodb example
Upstream-commit: f5bd13721666366879e3a9681df8442181448ffc
Component: engine
2013-08-21 12:09:40 -07:00
0957301291 add mongodb image example
Upstream-commit: 2c147dd721c5a92fa86af0ab4a6b9b9ebcd8d546
Component: engine
2013-08-20 18:08:15 -04:00
9fa228bf68 fixed postgresql conf setting
small typo, changed listen_address to listen_addresses
Upstream-commit: 83acd37161ed7149843546a779a95fdaf3e2458f
Component: engine
2013-08-19 14:20:25 +01:00
fd36c14020 Fix #1517, #1521 by adding sudo to examples and installation.
Upstream-commit: d4eab77f0c604e10f63519833dc25fbd5a3419bf
Component: engine
2013-08-14 16:21:36 -07:00