Commit Graph

12 Commits

Author SHA1 Message Date
0cad98a56c Add -f flag to cURL install instructions
From the -f description:

(HTTP) Fail silently (no output at all) on server errors. This is mostly done
to better enable scripts etc to better deal with failed attempts. In normal
cases when an HTTP server fails to deliver a document, it returns an HTML
document stating so (which often also describes why and more). This flag will
prevent curl from outputting that and return error 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9cf29be0ee0b19c25471c19c224f9af150beaf1e
Component: engine
2016-01-06 16:05:16 +01:00
e1e5d41283 Change "virtualization" to "containerization"
* Wording around what docker-machine does since the phrase "Docker virtual machine" can cause some confusion.
* Docker Machine isn't a distro in and of itself. It still uses boot2docker as the distro.
* Remove "virtualization" keywords.

Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: 0d1c5193b389052f11d77ca576f7dbb49b601135
Component: engine
2015-12-08 15:08:27 -07:00
0787af9472 Utillize build cache for Node.js web app example
Signed-off-by: Hans Kristian Flaatten <hans@starefossen.com>
Upstream-commit: 641c739fc1352aab8937ea8f0280082fa8e67ff8
Component: engine
2015-11-10 23:05:32 +01:00
ecd671294f First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 9ef855f9e5fa8077468bda5ce43155318c58e60e
Component: engine
2015-11-02 21:14:55 -08:00
6b6c7cc2b6 Enabled GitHub Flavored Markdown
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8fee1c2020186ac100b45e64864b94ae3a169ad5
Component: engine
2015-10-11 07:49:54 -07:00
ed6c3923f9 Touch up Node.js and MongoDB examples
- Remove extraneous '-' in sudo note.
- Correct space formatting (minor).
- Simplify instructions for install EPEL and install with yum directly.
- Add `nodejs` to yum install list explicitly to match the comments -- more transparent for new users who might not be clear `npm` package also installs `nodejs`.
- Remove '--noprealloc` from MongoDB example as the option has been depcated since Mongo 2.6 and is now the default behaviour. See: http://docs.mongodb.org/manual/reference/program/mongod/

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 549c8ea96eb036d60e3c9eea1ed8eb2d817e885a
Component: engine
2015-09-06 14:34:54 -07:00
cada1c181e Fix issue #15939: Hyperlink to MongoDB Dockerfile not found. Replaced with link to file in Github.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: f814ae437fa622c185e544d24bf0662b2337c91a
Component: engine
2015-08-31 19:28:36 -07:00
cd8e412feb Examples index has broken links
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 15c24db9a59bf2c3eb02f7a18ffd501284893ed3
Component: engine
2015-08-20 13:40:03 -07:00
06f659e1d1 Remove references to boot2docker replace with docker-machine
- boot2docker is deprecated in the 1.8.0
- docker-machine replaces it
- this fixes #14563
- Updating with thaJetzah comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 1825e06944db20ec677aa8d26b36e9036b0dd257
Component: engine
2015-07-27 18:25:50 -07:00
07938abda9 Add index.md to examples docs
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com>
Upstream-commit: 4f62dec548f47634e75ef9a0238de2bddc5bee33
Component: engine
2015-07-23 17:24:44 -07:00
c6caf278a1 Fixing seds, deleting old stuff
Signed-off-by: Mary Anthony <mary@docker.com>

Upding sed, adding script to avoid redirects, remove mkdos

Signed-off-by: Mary Anthony <mary@docker.com>

Ignoring graphics with sed

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing kitematic image

Signed-off-by: Mary Anthony <mary@docker.com>

Removing draft

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing link

Signed-off-by: Mary Anthony <mary@docker.com>

removing from the menu

Signed-off-by: Mary Anthony <mary@docker.com>

Updatiing order of project material

Signed-off-by: Mary Anthony <mary@docker.com>

Removing from Regsitry v2 content per Olivier

Signed-off-by: Mary Anthony <mary@docker.com>

tweaking the touchup

Signed-off-by: Mary Anthony <mary@docker.com>

Removing include; only used four places; hugo global var replace

Signed-off-by: Mary Anthony <mary@docker.com>

Entering fixes from page-by-page

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 328dbd0aa2a5aca656b45c4148cb09f715fbe677
Component: engine
2015-06-17 21:05:37 -07:00
9a276424db retooling for hugo
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Component: engine
2015-06-15 13:19:38 -07:00