Sven Dowideit
b8c51a787b
Merge pull request #4996 from rajatpandit/patch-2
...
Update nodejs_web_app.rst
Upstream-commit: 031e2880756155c26a2eac0e81275b7e0330db39
Component: engine
2014-04-04 14:41:32 +10:00
Rajat Pandit
b9704b19cb
Update nodejs_web_app.rst
...
Upstream-commit: 32d6041cc30a636de2f8da89f778c4b6c7d4df19
Component: engine
2014-04-03 21:05:50 +01:00
Rajat Pandit
66d94360a3
Update nodejs_web_app.rst
...
Upstream-commit: 3c36f82f181c4ce3b65dd15c4b6cb5699ea75075
Component: engine
2014-04-03 20:54:57 +01:00
David Röthlisberger
a941fe51a8
docs: Fix typo in hello world example
...
Upstream-commit: 8c4617e0ae3b9c7e5167883ca171ad8e23fc06b4
Component: engine
2014-04-03 09:40:28 +01:00
James Harrison Fisher
1bc1caf27c
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)
Upstream-commit: 64dd77fa0eb73ec4f395848982ccb60bb3bf8fc5
Component: engine
2014-03-27 23:02:44 +00:00
noducks
05ba4a16d9
Force flag to prevent file already exists error.
...
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com > (github: noducks)
Upstream-commit: 8e434c314ef74618001cc95466c2b567fa0283e2
Component: engine
2014-03-25 10:26:45 +00:00
Brian Goff
0164d2be10
Fix double single dash arg issues in docs
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: fbd6fee4ab9b98f477f365307a641b879badd282
Component: engine
2014-03-20 14:14:54 -04:00
Victor Vieux
d6e39e4b66
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)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
2014-03-19 22:03:11 +00:00
James Turnbull
6aee2c6f6c
Merge pull request #4754 from vojnovski/consistent_apt-key_use
...
refactor($hack,$docs): be consistent in apt-key keyserver URI usage
Upstream-commit: d3c5891486a263d96db5b1f8e0f0e0f698ad168d
Component: engine
2014-03-19 07:38:05 -06:00
Viktor Vojnovski
0ff768e136
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)
Upstream-commit: 4fd82db4beba03a126dfc557c86d5d52e9066dae
Component: engine
2014-03-19 10:20:10 +01:00
Sven Dowideit
a6d7cc047e
Merge pull request #4758 from crosbymichael/redis-bind
...
Be explicit about binding to all interfaces in redis example
Upstream-commit: 9bbc11b2aeb0652cf44f0bc583430b37356bef7c
Component: engine
2014-03-19 13:04:02 +10:00
Michael Crosby
6a56789e29
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)
Upstream-commit: 7822b053cbd2288b6c8d9c51a8f495368bc77f35
Component: engine
2014-03-18 17:24:06 -07:00
Michael Crosby
4caf655f4f
Add sudo clause if your using osx or tcp
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 38a3fc3e0e9b56400b2c7d2fce3bfc7b15395d14
Component: engine
2014-03-18 17:07:45 -07:00
zqh
8e25e532b5
Update nodejs_web_app.rst
...
the address of epel rpm has change to http://dl.fedoraproject ....
Upstream-commit: 853c5e258fc9a3d8420e62aaed4817179073610a
Component: engine
2014-03-16 01:07:22 +08:00
Tianon Gravi
c48adc6929
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)
Upstream-commit: 44fe8cbbd174b5d85d4a063ed270f6b9d2279b70
Component: engine
2014-03-13 11:46:02 -06:00
Sven Dowideit
e1d60948d6
Merge pull request #4526 from Rovanion/master
...
All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
Upstream-commit: 2ad16c88e24ba87fea9f31209e663bfb9ada51a0
Component: engine
2014-03-12 22:24:00 +10:00
Sven Dowideit
41f81364c7
fixes suggested by James
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 8bf63d532622e22070b92ee71dcb972ace4b9b40
Component: engine
2014-03-12 22:02:24 +10:00
Rovanion Luckey
68795e371e
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)
Upstream-commit: b24be254fa042e62e1a08af9105ac92da13a6336
Component: engine
2014-03-09 11:08:11 +01:00
Johannes 'fish' Ziemke
46c0bc2613
Add authenticated TLS support for API
...
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
Upstream-commit: c000cb64712349141596318dea2a8de2462c8f81
Component: engine
2014-03-09 00:06:44 +01:00
Sven Dowideit
166080d0ce
implement pharvey's suggestions
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: cadd94f44c6f6e276a5b028a2935b5e352408d3b
Component: engine
2014-03-05 13:12:29 +10:00
Sven Dowideit and Sven Dowideit
8287b26da8
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)
Upstream-commit: 28a545d294cac3b2e1f4266f5099bd2c5ddb342f
Component: engine
2014-03-05 13:12:25 +10:00
unclejack
0802cd5e0f
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)
Upstream-commit: 73a277eb2fd66b815b11e9d2caff2c31c18a0854
Component: engine
2014-02-20 01:11:04 +02:00
Andy Rothfusz
f1f31be89b
Merge pull request #4114 from SvenDowideit/update-sshd-example
...
update the sshd example to use just a Dockerfile
Upstream-commit: 836a49a46e6ff51a0ef73eb170935f0d138b932e
Component: engine
2014-02-18 12:12:52 -08:00
Andy Rothfusz
b1aa1c1a6a
Merge pull request #4147 from float64/patch-1
...
Env Clarification
Upstream-commit: 3a2fa54857d23e0070c7818eb9752ef263e0a9fe
Component: engine
2014-02-18 12:07:39 -08:00
Andy Rothfusz
c7021aec80
Merge pull request #4145 from SvenDowideit/redo-python-example
...
touch up the examples
Upstream-commit: c14c539c6c16e604817ea0b4bf8bd7dc58e2a5ac
Component: engine
2014-02-18 11:08:45 -08:00
Matthias Kühnle and Matthias Kühnle
d71035c5b7
Reword - one sentence :-)
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
Upstream-commit: 311cb5ca45c15c32408d54194470536e73ae016d
Component: engine
2014-02-18 16:04:47 +01:00
Matthias Kühnle
983d3e7de3
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)
Upstream-commit: c1dfc63845cdf08d7609e1890f45d01f10326bda
Component: engine
2014-02-18 12:47:44 +01:00
Matthias Kühnle
e867f9248c
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)
Upstream-commit: d73d3b03e4216bf6cf44b393108dd520acac9670
Component: engine
2014-02-18 12:36:14 +01:00
Matthias Kühnle and Matthias Kühnle
efed40e022
Fixed misspelling
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
Upstream-commit: 8a3cb0c65e7940e928e31d6e64cce5d81d9975a6
Component: engine
2014-02-18 11:38:23 +01:00
Matthias Kühnle and Matthias Kühnle
e8870b2f18
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)
Upstream-commit: a7f1b74dd812fbc86beefea6fcd3ba4c4abaa7e2
Component: engine
2014-02-18 11:36:46 +01:00
Yasunori Mahata
92abc1e651
Fix typo in 'Using Supervisor with Docker' example
...
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com > (github: mahata)
Upstream-commit: 68de32888b6bad84cd37ccd165b0e7bb013574af
Component: engine
2014-02-17 19:43:56 -08:00
Sven Dowideit
ca7b056023
suggested improvements
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 29f7e1bfcbe6654d962a55eb5006e248284b9e0c
Component: engine
2014-02-18 13:23:28 +10:00
Sven Dowideit and Sven Dowideit
32cc7c3201
update a new movie: http://asciinema.org/a/7658
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: b05602a0fe6d9b9731cee0008fbac27250f361bd
Component: engine
2014-02-18 13:23:28 +10:00
Sven Dowideit
244da2b520
swap busybox for ubuntu, its quicker..
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: f535a58959809dbb613bf529019f26cc6ae0c6f9
Component: engine
2014-02-18 13:23:28 +10:00
Sven Dowideit
5f957db92e
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)
Upstream-commit: 3036b5a196fdbb744f94299c82dc44078361bdae
Component: engine
2014-02-18 13:23:28 +10:00
Sven Dowideit and Sven Dowideit
ef1966871e
update the sshd example to use just a Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a6182dc62ea335c40961c7e528b38b85d2569d07
Component: engine
2014-02-14 13:27:58 +10:00
Sven Dowideit and Sven Dowideit
afe2170b4f
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)
Upstream-commit: 2ed2ba4e8caa2d70d57d124a2f3509f400d8187e
Component: engine
2014-02-12 10:30:57 +10:00
Andy Rothfusz
2e2c23075e
Updated width to 815 per comment.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: fca2f3e742d699688c9891ccf9dd8e58591aed08
Component: engine
2014-02-03 16:06:29 -08:00
Andy Rothfusz
7b2e0fd00d
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)
Upstream-commit: b0f4ad431d79869111cfbf506a783a275c274c68
Component: engine
2014-01-31 18:02:45 -08:00
Mike Naberezny
47410e7905
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)
Upstream-commit: 2ba2a8ae40b83ac1cc0c4a60724073fa8255b257
Component: engine
2014-01-26 11:53:22 -08:00
Solomon Hykes
f0d14c9de1
Docs: fix capitalization of "Docker"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: ae2af201f340420f70ca05d54d150764bd88e680
Component: engine
2014-01-21 07:27:55 +00:00
Solomon Hykes
61cb59e7c7
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)
Upstream-commit: 76eee50a67732ee18a678ebf54720b78370254df
Component: engine
2014-01-21 03:43:16 +00:00
Victor Vieux and Victor Vieux
7822beced6
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)
Upstream-commit: e71dbf4ee5add5736f595948fc20bd01af56a744
Component: engine
2014-01-17 17:33:15 -08:00
Gert van Valkenhoef
1fff9851f9
Add the customary bold
...
Upstream-commit: 8298a200ce3bbab7d00ab73e8bac34643c7a1fc5
Component: engine
2014-01-08 18:45:06 +01:00
Gert van Valkenhoef
941cab2b70
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.
Upstream-commit: c9cebf3a73efa4827d051ddd69a8590b03419f8a
Component: engine
2014-01-08 10:58:55 +01:00
Andy Rothfusz
8ca6e8443f
Keep original transcript in Thatcher's voice
...
and clarify that this is an update to the example.
Upstream-commit: 82a47b0e82367aa5f1b6d15816c7e66abdffb06a
Component: engine
2014-01-02 16:17:52 -08:00
rgstephens
d5ba3da179
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
Upstream-commit: 1f80c2a652b03d84718c2e61b7761f939de3b07a
Component: engine
2013-12-30 17:50:58 -08:00
Andy Rothfusz
e5d73f33fc
Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
...
Conflicts:
docs/sources/examples/postgresql_service.rst
Upstream-commit: 0bfa22124e87197be8ce47cee4e998eb9d6891b5
Component: engine
2013-12-04 18:25:58 -08:00
Andy Rothfusz
dce2c8c9b7
Merge pull request #2946 from dhrp/doc-postgres-typo
...
Fixed some grammar and one other line in postgres example
Upstream-commit: de60bee3d4f34cdc61120463851fb996c4d8eb4c
Component: engine
2013-12-04 10:51:02 -08:00
Dustin Sallings
b0a3ce1eef
Use inspect format to get IP address for psql example
...
Upstream-commit: 1d503be4660667a27b42f7bf0c089404cabd2c9c
Component: engine
2013-12-02 11:07:41 -08:00
Sven Dowideit
Rajat Pandit
David Röthlisberger
James Harrison Fisher
noducks
Brian Goff
Victor Vieux
James Turnbull
Viktor Vojnovski
Michael Crosby
zqh
Tianon Gravi
Rovanion Luckey
Johannes 'fish' Ziemke
Sven Dowideit
unclejack
Andy Rothfusz
Matthias KühnleandMatthias Kühnle
Yasunori Mahata
Mike Naberezny
Solomon Hykes
Victor VieuxandVictor Vieux
Gert van Valkenhoef
rgstephens
Andy Rothfusz
Dustin Sallings