Commit graph

158 commits

Author SHA1 Message Date
noducks
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
Brian Goff
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
Victor Vieux
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
James Turnbull
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
Viktor Vojnovski
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
Sven Dowideit
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
Michael Crosby
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
Michael Crosby
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
zqh
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
Tianon Gravi
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
Sven Dowideit
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
Sven Dowideit
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
Rovanion Luckey
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
Johannes 'fish' Ziemke
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
Sven Dowideit
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
Sven Dowideit
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
unclejack
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
Andy Rothfusz
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
Andy Rothfusz
3a2fa54857 Merge pull request #4147 from float64/patch-1
Env Clarification
2014-02-18 12:07:39 -08:00
Andy Rothfusz
c14c539c6c Merge pull request #4145 from SvenDowideit/redo-python-example
touch up the examples
2014-02-18 11:08:45 -08:00
Matthias Kühnle
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
Matthias Kühnle
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
Matthias Kühnle
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
Matthias Kühnle
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
Matthias Kühnle
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
Yasunori Mahata
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
Sven Dowideit
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
Sven Dowideit
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
Sven Dowideit
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
Sven Dowideit
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
Sven Dowideit
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
Sven Dowideit
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
Andy Rothfusz
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
Andy Rothfusz
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
Mike Naberezny
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
Solomon Hykes
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
Solomon Hykes
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
Victor Vieux
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
Gert van Valkenhoef
8298a200ce Add the customary bold 2014-01-08 18:45:06 +01:00
Gert van Valkenhoef
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
Andy Rothfusz
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
rgstephens
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
Andy Rothfusz
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
Andy Rothfusz
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
Dustin Sallings
1d503be466 Use inspect format to get IP address for psql example 2013-12-02 11:07:41 -08:00
James Turnbull
39aac21db4 Updated and simplified the PG example 2013-11-30 10:58:52 -05:00
Thatcher Peskens
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
Thatcher
139644895e Merge pull request #2894 from brunoqc/patch-1
Update postgresql's version in example
2013-11-28 17:16:25 -08:00
John Warwick
f1e44e0b0c Remove explanation of removed argument 2013-11-28 09:55:15 -05:00
Bruno Bigras
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