2f3cb370df
Fixed #5283 - literal leftover from cutover
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-04-17 18:58:02 -04:00
1ff66d27b5
Fix for broken in-document links which got scrambled during conversion.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-04-17 18:09:08 +03:00
ac999a9cb2
now, with shiney markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-04-16 11:04:14 +10:00
031e288075
Merge pull request #4996 from rajatpandit/patch-2
...
Update nodejs_web_app.rst
2014-04-04 14:41:32 +10:00
32d6041cc3
Update nodejs_web_app.rst
2014-04-03 21:05:50 +01:00
3c36f82f18
Update nodejs_web_app.rst
2014-04-03 20:54:57 +01:00
8c4617e0ae
docs: Fix typo in hello world example
2014-04-03 09:40:28 +01:00
64dd77fa0e
Add missing port NAT configuration
...
Missing port translation causes last line to fail
Docker-DCO-1.1-Signed-off-by: James Fisher <jameshfisher@gmail.com> (github: jameshfisher)
2014-03-27 23:02:44 +00:00
8e434c314e
Force flag to prevent file already exists error.
...
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com> (github: noducks)
2014-03-25 10:26:45 +00:00
fbd6fee4ab
Fix double single dash arg issues in docs
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-03-20 14:14:54 -04:00
12687b7c10
Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-19 22:03:11 +00:00
d3c5891486
Merge pull request #4754 from vojnovski/consistent_apt-key_use
...
refactor($hack,$docs): be consistent in apt-key keyserver URI usage
2014-03-19 07:38:05 -06:00
4fd82db4be
refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740
...
In #4740 , the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.
Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com> (github: vojnovski)
2014-03-19 10:20:10 +01:00
9bbc11b2ae
Merge pull request #4758 from crosbymichael/redis-bind
...
Be explicit about binding to all interfaces in redis example
2014-03-19 13:04:02 +10:00
7822b053cb
Be explicit about binding to all interfaces in redis example
...
Fixes #4021
Moved to debian because the redis installed in ubuntu is really old
and does not support args via the cli.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-18 17:24:06 -07:00
38a3fc3e0e
Add sudo clause if your using osx or tcp
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-18 17:07:45 -07:00
853c5e258f
Update nodejs_web_app.rst
...
the address of epel rpm has change to http://dl.fedoraproject ....
2014-03-16 01:07:22 +08:00
44fe8cbbd1
Update to double-dash everywhere
...
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-13 11:46:02 -06:00
2ad16c88e2
Merge pull request #4526 from Rovanion/master
...
All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
2014-03-12 22:24:00 +10:00
8bf63d5326
fixes suggested by James
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-03-12 22:02:24 +10:00
b24be254fa
All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
...
Docker-DCO-1.1-Signed-off-by: Rovanion Luckey <rovanion.luckey@gmail.com> (github: Rovanion)
2014-03-09 11:08:11 +01:00
c000cb6471
Add authenticated TLS support for API
...
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
2014-03-09 00:06:44 +01:00
cadd94f44c
implement pharvey's suggestions
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-05 13:12:29 +10:00
28a545d294
Show some ENV / local updated baseimage tricks that use an apt-cacher-ng proxy to make debian based installations instant
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-03-05 13:12:25 +10:00
73a277eb2f
don't skip cert check for an example & use HTTPS
...
This changes two URLs from http to https and it fixes a Dockerfile to
stop skipping certificate validation. It also adds the ca-certificates
package to that Dockerfile example.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-02-20 01:11:04 +02:00
836a49a46e
Merge pull request #4114 from SvenDowideit/update-sshd-example
...
update the sshd example to use just a Dockerfile
2014-02-18 12:12:52 -08:00
3a2fa54857
Merge pull request #4147 from float64/patch-1
...
Env Clarification
2014-02-18 12:07:39 -08:00
c14c539c6c
Merge pull request #4145 from SvenDowideit/redo-python-example
...
touch up the examples
2014-02-18 11:08:45 -08:00
311cb5ca45
Reword - one sentence :-)
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 16:04:47 +01:00
c1dfc63845
Updated environment description
...
.. to make it even more clear that this env variables are there because of the --link option.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 12:47:44 +01:00
d73d3b03e4
Reworded description of the environment variables
...
Removed the "test now..." b/c the code example is only about inspection
of env-variables.
Test follows in the next section.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 12:36:14 +01:00
8a3cb0c65e
Fixed misspelling
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 11:38:23 +01:00
a7f1b74dd8
Env Clarification
...
Clarified that the env variables here are an example output of env. The user should not set them to the example values.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
2014-02-18 11:36:46 +01:00
68de32888b
Fix typo in 'Using Supervisor with Docker' example
...
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com> (github: mahata)
2014-02-17 19:43:56 -08:00
29f7e1bfcb
suggested improvements
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
b05602a0fe
update a new movie: http://asciinema.org/a/7658
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
f535a58959
swap busybox for ubuntu, its quicker..
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
3036b5a196
rejig the helloflask example as more advanced, and move it to the end
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
a6182dc62e
update the sshd example to use just a Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-14 13:27:58 +10:00
2ed2ba4e8c
rewrite the PostgreSQL example using a Dockerfile, and add details to it
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-02-12 10:30:57 +10:00
fca2f3e742
Updated width to 815 per comment.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-02-03 16:06:29 -08:00
b0f4ad431d
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-01-31 18:02:45 -08:00
2ba2a8ae40
Use exec to replace bash with apache2 after environment is set up
...
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com> (github: mnaberez)
2014-01-26 11:53:22 -08:00
ae2af201f3
Docs: fix capitalization of "Docker"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-01-21 07:27:55 +00:00
76eee50a67
docs: add standard 'check your docker install' paragraph to the 'hello world' examples.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-01-21 03:43:16 +00:00
e71dbf4ee5
update commands.go
...
update docker.go
move to pkg
update docs
update name and copyright
change --sinceId to --since-id, update completion and docs
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
2014-01-17 17:33:15 -08:00
8298a200ce
Add the customary bold
2014-01-08 18:45:06 +01:00
c9cebf3a73
Hello World: fix detach behavior
...
The hello world example relies on being able to exit the container attachment using Control-C without stopping it. According to this thread (and my own experience), this doesn't work anymore:
https://groups.google.com/forum/#!msg/docker-user/nWXAnyLP9-M/kbv-FZpF4rUJ
Added -sig-proxy=false to the attach command.
2014-01-08 10:58:55 +01:00
82a47b0e82
Keep original transcript in Thatcher's voice
...
and clarify that this is an update to the example.
2014-01-02 16:17:52 -08:00
1f80c2a652
Update for Ubuntu 13.10
...
With two additional commands, this procedure will work for Ubuntu 13.10 using the image stackbrew/ubuntu:13.10.
1) change /etc/pam.d/sshd, pam_loginuid line 'required' to 'optional'
2) echo LANG=\"en_US.UTF-8\" > /etc/default/locale
2013-12-30 17:50:58 -08:00
0bfa22124e
Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
...
Conflicts:
docs/sources/examples/postgresql_service.rst
2013-12-04 18:25:58 -08:00
de60bee3d4
Merge pull request #2946 from dhrp/doc-postgres-typo
...
Fixed some grammar and one other line in postgres example
2013-12-04 10:51:02 -08:00
1d503be466
Use inspect format to get IP address for psql example
2013-12-02 11:07:41 -08:00
39aac21db4
Updated and simplified the PG example
2013-11-30 10:58:52 -05:00
8291d509c2
Fixed some grammar and one other line about needing the postgresql-client for connecting to the service.
2013-11-28 17:19:26 -08:00
139644895e
Merge pull request #2894 from brunoqc/patch-1
...
Update postgresql's version in example
2013-11-28 17:16:25 -08:00
f1e44e0b0c
Remove explanation of removed argument
2013-11-28 09:55:15 -05:00
45b1e8c236
Update postgresql's version in example
...
It seems ppa:pitti/postgresql will be deprecated and only apt.postgresql.org has 9.3.
2013-11-27 09:55:41 -05:00
937f52aef9
docker in-container process management with CFEngine
2013-11-25 14:24:23 -08:00
ba2b36e192
Added a Supervisor process management example
2013-11-25 14:05:01 -05:00
3656db66d2
fixed typos, and made small improvements to the wording
2013-11-19 14:44:50 +01:00
511a62a099
Merge pull request #2755 from metalivedev/test-2592
...
Replace PR#2592
2013-11-18 15:29:48 -08:00
e12bba66ea
Merge pull request #2709 from eugenkrizo/patch-1
...
path needs to be specified to 'docker build' command
2013-11-15 13:34:08 -08:00
9a9d3239e1
Fix typos, add links, streamline content of #2592
2013-11-15 11:38:03 -08:00
33110ddc3f
Merge branch 'fix_examples_use_docs' of git://github.com/rogaha/docker into test-2592
2013-11-15 11:15:14 -08:00
492ce4c665
port published explicitly (for docker 0.6.6)
...
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
2013-11-15 17:12:48 +01:00
007964793d
path needs to be specified to 'docker build' command
...
current folder '.' appended as a path
2013-11-15 16:16:59 +01:00
f5e6c2d060
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.
2013-11-13 13:20:38 +01:00
eba3c36b38
- Included the sudo alternative as an example_header
2013-11-07 14:44:07 -08:00
304d39cc50
- Fix the attach examples according to the new attach behavior
...
- Add the option of adding the user to docker's group and avoid the usage of "sudo" before each command
2013-11-07 14:06:49 -08:00
37dcff0c13
Merge pull request #2557 from jamtur01/new_redis
...
Updated Redis service example to use links. Removed "Linking Redis" example as redundant.
2013-11-06 17:54:34 -08:00
3108f0526e
Add -p when running the container
...
Without it, docker was not mapping/exposing the private port
Docker version 0.6.5, build 3ff8459
2013-11-05 20:48:16 -08:00
e88368b34c
Removed redundant linking example
2013-11-05 14:28:57 -06:00
1182797c6d
Updated Redis service example to use links
2013-11-04 19:18:37 -06:00
19ad299600
Merge pull request #2534 from jamtur01/examples_fixes
...
A variety of syntax and style fixes for the Docker examples
2013-11-04 12:35:57 -08:00
1cb4557cc8
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
2013-11-02 18:26:52 -07:00
c33d26a8da
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
2013-11-02 17:53:44 -07:00
09607bb8f6
Merge pull request #2475 from dudebout/patch-2
...
Fixes the password value in the redis/links example
2013-10-31 12:17:43 -07:00
7e7c931d2b
Fixes another instant of the password
2013-10-31 08:55:14 -04:00
f77bbfca56
Fix typo
2013-10-31 00:07:58 -05:00
ccc1a5dcfb
Fixes the password value in the redis/links example
2013-10-30 22:52:47 -04:00
a4d97a4e80
Update links and host integration documentation
2013-10-30 11:59:05 -07:00
1de23f1b81
Expose IP, port, proto as sep. env vars when linking, Closes #2430
2013-10-28 23:02:28 -07:00
0d2924408b
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.
2013-10-28 18:09:08 -07:00
99a9783abc
fix typo in docs
2013-10-25 15:13:24 -07:00
515070d513
Remove docker ls from docs and cli usage
2013-10-25 15:13:24 -07:00
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
689bcd1dc3
Clean up build warnings. Remove redundant files.
2013-10-17 17:57:01 -07:00
dab84f7e8b
Revert "Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example."
...
This reverts commit f4c17a202b
2013-10-16 14:38:24 -07:00
93b258413f
Merge pull request #2160 from iffy/patch-1
...
Minor updates to postgresql_service.rst
2013-10-14 11:59:57 -07:00
9041d6a47b
Minor updates to postgresql_service.rst
...
I've added the steps that were missing/wrong for me when I went through this just now.
2013-10-10 10:23:24 -06:00
152037f011
Corrected error in the package name
2013-10-10 10:10:33 +02:00
f4c17a202b
Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example.
2013-10-08 17:33:19 -07:00
e3e041b6bf
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
2013-09-27 19:54:52 -07:00
c000e6a7fc
revert removal of slash betwixt user/repo
2013-09-24 15:51:21 -05:00
17b7194d91
use su instead of sudo
2013-09-24 02:25:16 -05:00
15ad2915b9
various command fixes
...
Indicating the repository and tag should be separated by a space and not a '/'. Also fixed a quote typo.
2013-09-24 02:12:24 -05:00
a18c26392f
Docs: remove reference to deprecated 'base' image
2013-09-19 10:25:30 -06:00
67453d6b48
Fix #1654 Improve the introduction to repositories flow.
2013-09-17 19:01:11 -07:00
dfe45e1ad5
Update hello_world.rst
...
Small typo
2013-09-11 15:35:05 -04:00
James Turnbull