Commit Graph

224 Commits

Author SHA1 Message Date
77651137b6 Merge pull request #11870 from dekobon/master
11558 - Documentation fixes and improvements for Riak Dockerfile
Upstream-commit: 584df44d424b0a884782bf7a9218a5a9473fe12d
Component: engine
2015-03-29 12:42:54 -07:00
6280a1894a Added updated working Riak Dockerfile and documentation.
Signed-off-by: Elijah Zupancic <elijah@zupancic.name>
Upstream-commit: de45aacc322445924710fc12ad6e2d9832c27c6e
Component: engine
2015-03-27 12:03:46 -07:00
0644b1baca Removed references to creating an OpenSSH server. This method of accessing the Docker container is no longer needed now that the exec command is available.
Signed-off-by: Elijah Zupancic <elijah@zupancic.name>
Upstream-commit: 31c50411574b19cb81b5f88c0f8ca4bb4a2ead83
Component: engine
2015-03-27 12:03:34 -07:00
0134fde659 Removed ulimit steps from Dockerfile because they aren't applied according to @cpuguy83.
Signed-off-by: Elijah Zupancic <elijah@zupancic.name>
Upstream-commit: 17303b18b8813a184dadaacf63b10a419e476d07
Component: engine
2015-03-27 12:03:24 -07:00
e5276fe0a7 Removing sudo from command line examples
We now advise people to configure docker group and
add to sudo.  Mac shouldn't use sudo.  Removed sudo
from command examples.  Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 29d01b7ddedb5d1b5ec2262e2d961b737cbc6f38
Component: engine
2015-03-26 11:12:37 -07:00
d4497c7a2b .: remove trailing white spaces
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7617ec176d266650b19c2378ccab4aa41e6dc5a2
Component: engine
2015-03-25 13:38:17 -04:00
abd71318ca Revert "Dealing with trailing whitespaces"
The validation script from #10681 is too pedantic, and does not handle
well situations like:

```
cat <<EOF   # or <<-EOF
	Whether the leading whitespace is stripped out or not by bash
	it should still be considered as valid.
EOF
```

This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 0252ad0adc37a34b88fa908ae74a13b940febdcb
Component: engine
2015-03-25 10:04:56 -06:00
a64392e089 Dealing with trailing whitespaces
Created a validation that detects all trailing whitespaces from every
text file that isn't *.go, *.md, vendor/*,
docs/theme/mkdocs/tipuesearch*

Removed trailing whitespaces from every text file except from vendor/*
builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch* and *.md

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 4e65c1c319afffc325853b88c9aef0c42ec83482
Component: engine
2015-03-17 03:34:01 +00:00
6fae379b61 Smallest typo correction ever
Signed-off-by: Cyril Francesconi <cyrilf7x@gmail.com>
Upstream-commit: 582c360d5741a6dce35af1e7607ee636bcf4eb4c
Component: engine
2015-02-14 17:51:28 +01:00
da0bb2cbb5 Use gpg keyserver pool
Make the install script independent from the ubuntu keyserver by using
the sks-keyservers pool instead.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f058e9c43c8752dedcd4d251ddf105b22d0ed1d5
Component: engine
2015-02-13 09:13:29 -08:00
adb4e7d83e Add usage of port mapping for Boot2docker.
Signed-off-by: Yongzhi Pan <panyongzhi@gmail.com>
Upstream-commit: 9dc2d0b8a35724946139f954f9575411b31695ea
Component: engine
2015-01-19 16:44:13 +08:00
2872296531 Update Ubuntu image tag to 14.04
`apt-get update` for non-supported 12.10 doesn't work.
Building failed with
```
INFO[0011] The command [/bin/sh -c apt-get update && apt-get install -y redis-server] returned a non-zero code: 100
```

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
Upstream-commit: 736558b6ae15afb3f5f0d7ba7801fa44bec9f285
Component: engine
2015-01-07 18:12:02 +03:00
912c56d931 add Scott's link checker script, and fix what it finds
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fbb9223b1adc16834768acaa7a5776697825deb2
Component: engine
2014-12-16 14:46:25 +10:00
c1f75e87da DOCKER_VERSION and docker-version havn't been implemented.
So far, it looks like the declarations are not used, and so its safer not to
confuse people into thinking they do something.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 6ed610fb8014d500e001bb0677f0e1af0dc9312d
Component: engine
2014-10-21 16:04:11 +10:00
67eb2ed955 Minor changes to SSHd example
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: f1c319f77cc4ba97ab56a7b0d1e18a4cf12db7ba
Component: engine
2014-10-11 16:30:36 -04:00
f30fc49b3d Fix for user kicked off after login on some hosts
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 7faa43d707e1c0a67262d149cd42dab4bf3f8812
Component: engine
2014-09-22 13:33:38 +10:00
cd4d60a084 Consistently use 'sudo docker' in examples
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: fc9a3b1c1b835c170a4916362855e127a0e366e1
Component: engine
2014-09-16 11:49:05 +10:00
ec6541bfd4 Document how to pass ENV vars to the user's shell
As this is a somewhat common question.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 0517099a91a3ca073efb2131684bbf3ab565644a
Component: engine
2014-09-12 13:34:01 +10:00
4d1ff5fd83 Update SSH demo to ubuntu 14.04
Signed-off-by: Jan Keromnes <janx@linux.com>
Upstream-commit: 98f57d1c392eab7df30fa3179c8e0f99a418e772
Component: engine
2014-09-04 20:27:41 +02:00
9fba71437d Update nodejs_web_app.md
Upstream-commit: 2d1ec162be15d6d1107d4775d75744c9d23f8478
Component: engine
2014-08-30 16:02:47 +09:00
ca40497b63 Update postgresql_service.md
fix typo
Upstream-commit: 99423e7e1ef7d833e333389b15a372179734c03f
Component: engine
2014-08-12 23:30:04 -05:00
a345fa1cd7 Merge pull request #7278 from Toebez/patch-1
Update nodejs_web_app.md
Upstream-commit: 33d6b20c133348fed0d803fbe350b5a663974345
Component: engine
2014-08-07 23:16:37 -04:00
c62c248793 Update nodejs_web_app.md
Updated to documentation to use the centos6 image instead of the unofficial tutum image of centos6.4
Upstream-commit: bfacdfdccf5e93301842309a0048990ef0ebb549
Component: engine
2014-07-31 08:54:22 +02:00
e2390724e7 Standardize "apt-get install" usage across the repo
I might have missed some, but I think this is most of the offenders.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: fc637b5275c2fe23c9857a34316a783042d906b8
Component: engine
2014-07-28 17:41:59 -06:00
65df9ecf1a Update nodejs_web_app.md
The image centos:centos6.4 doesn't exist. Instead you have to choose between the official centos6 or centos7. Both images does not work together with de yum npm install. When choosing an centos6.5 from another distributor (tutum) it works.
Upstream-commit: 2519872d77da8cb6a9c5f55e44cfaeb9cd603978
Component: engine
2014-07-28 20:43:24 +02:00
6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
cec25b5ea2 Fix a typo in the tutorial
Upstream-commit: 9ff7bbe0ac4172ea15242218e9ac4668eddc1e7f
Component: engine
2014-07-21 10:34:54 +02:00
013dc5d8c5 removed default --rm option from example build command
this line gave the false impression that containers are not removed
unless you specify the --rm argument.
Upstream-commit: c5f55a233de09f8aa4ce7f061e8da2d435017fef
Component: engine
2014-07-16 11:18:08 +02:00
b8d866ae4d Merge pull request #6885 from tianon/standard-curl-sSL
Upstream-commit: 781a47e3f37f952630d2bdf4936388aaf52f3707
Component: engine
2014-07-14 18:39:31 -07:00
efd625f4f3 Replaced selected docs references to ADD with COPY
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a1ddf57216e510c5cabe40cac6a00ac57a92b8d7
Component: engine
2014-07-09 17:13:26 -04:00
e6a7274d4c Standardize "curl" arguments across the repo to be or include "-sSL"
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9f61e233c6da72f692190f1f5eb672341253f3e7
Component: engine
2014-07-07 10:35:38 -06:00
1991704086 Update running_riak_service.md
Upstream-commit: 963ee6ce795ae6608ee9acce4bc6298356d7f02f
Component: engine
2014-07-07 17:52:18 +04:00
c8806a50df I'm going to wish I didn't do this
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: fa29b1f062d25c1a8ca62f02b9cc7533df4c7449
Component: engine
2014-07-03 10:31:56 +10:00
23fab74a7a Lowercase world, because its not important.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: a09f99b8b0e157e3bb72ad0c9dad8d83896c5182
Component: engine
2014-07-01 15:07:48 -07:00
0b328b5e86 Update nodejs_web_app.md
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
Upstream-commit: 15ea1ca1f0d5190645b2ec0c0971daa3cdee30df
Component: engine
2014-06-27 11:39:58 +09:00
ab438bdbda Update examples/nodejs_web_app
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
Upstream-commit: 6bb6e422b5cd9e9ee97c5855a94b5776323a5626
Component: engine
2014-06-26 15:19:30 +09:00
2ee8468f73 Updated SSH example to ensure it continues working
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 10eae16fa70ac04191401bf2872ffa6688f79b82
Component: engine
2014-06-19 07:44:41 -05:00
757c6e1688 Initial links
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: ef364f7e1faedddab502cf91c0551154c6c48176
Component: engine
2014-06-08 14:54:32 -07:00
15bbcd7308 Fixes broken ssh server example
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 04620e01547d6526023b49494919f3eb3fcf900a
Component: engine
2014-06-05 14:10:52 -04:00
6fe0f07752 Changed all references from Trusted Builds to Automated Builds
* Updated docker images output
* Deprecated docker images -t/--trusted option and replace with --automated
* Changed *trusted variables to *automated
* Changed added support for is_automated alongside deprecated is_trusted
* Updated man pages, docs and completion
* Updated API documentation

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 9fc8028c987ac560ceb3b29eb609d77a82abdacc
Component: engine
2014-06-03 12:55:30 -07:00
1b1746cd69 Adding User Guide
* Added User Guide section outlines.
* Added User Guide to menu.
* Moved HTTPS example to articles.
* Replaced Hello World example with User Guide.
* Moved use cases out of examples.
* Updated Introduction to add User Guide.
* Redirected migrated /use and /articles links.
* Added Docker.io section
* Added Dockerized section
* Added Using Docker section
* Added Docker Images section
* Added Docker Links section
* Added Docker Volumes section

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a7b2c4804b2d98c2b5622db40d3d70b88529d7fe
Component: engine
2014-06-01 17:34:07 -04:00
81343783d4 Updated link to new docker-node-hello repository
Upstream-commit: 0658868c7f81dd225df8678f31f7ef70274d8d94
Component: engine
2014-05-31 14:55:59 -06:00
62daf025f0 updated documentation for mentioning images vs containers
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)

rebased by

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
4ce695adff Update using_supervisord.md
changed the version of ubuntu to 13.04. In latest sshd will not work.
Upstream-commit: 9429fe6f49a4396cdd0ab2f0b88240ff0239a070
Component: engine
2014-05-23 21:15:44 +02:00
a2fa77b792 Fixes some docs issues with using single-dash arguments where they should be double
I found a bunch of issues where we have "-<opt>" instead of "--<opt>".
Also a couple of other issues, like "-notrunc", which is now "--no-trunc"
Fixes #5963

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 6d9e64b27bbee9bb699ebc0f0ff98bb7f56961b3
Component: engine
2014-05-21 09:35:22 -04:00
876c525e4c removing grep command that depends on perl, better for boot2docker
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
Upstream-commit: 7f9178c6d15417ed8b32976b7ca075422c8160da
Component: engine
2014-05-18 10:02:39 -07:00
77c903866a Merge pull request #5805 from joelhandwell/patch-2
changed deprecated -name option to --name
Upstream-commit: 343c24a5faa6b92897349eca212f04260a48886c
Component: engine
2014-05-14 22:09:17 +01:00
68f263f160 changed deprecated -name option to --name
changed deprecated -name option to --name
Upstream-commit: 2d622df835f8c80b213a68bbceef21fb003a9a6a
Component: engine
2014-05-14 16:24:08 -04:00
89b28579db changed deprecated -rm option to --rm
changed deprecated -rm option to --rm
Upstream-commit: 137f4b326ad1669cd562fa59d809f39d21b653fe
Component: engine
2014-05-14 16:22:38 -04:00
63756f9b02 Merge pull request #5599 from ostezer/docs-rewrite-examples-mongodb
Rewrite and update the MongoDB service article
Upstream-commit: 12201e2ea34148276bd7cf287e6171c0a40b5aff
Component: engine
2014-05-09 10:25:37 +02:00