Commit Graph

553 Commits

Author SHA1 Message Date
Victoria Bialas 392e93a277 WIP: graphical and format updates for workflow steps on home page
simplified the workflow title

WIP: graphical and format updates for workflow steps on home page

working on better formatting for subtopic bullets

formatting updates and wording tweaks to workflow on home page

wording tweak on app tutorial where to learn more

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-28 16:39:53 -08:00
Sebastiaan van Stijn bc41b07086 Merge pull request #1351 from thaJeztah/fix-broken-link
fix link to logging context
2017-01-27 11:45:21 +01:00
Victoria Bialas 3d2c580203 added diagram to voting app tutorial
added links to the glossary for image and container

updated diagram colors, added sketch source file

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-26 19:40:03 -08:00
Misty Stanley-Jones 3856a785a5 Merge pull request #1391 from Teszko/patch-1
instructions do not apply to debian
2017-01-26 14:36:49 -08:00
Victoria Bialas 3f06af3e6e Merge pull request #1399 from londoncalling/voting-app-more-updates
app tutorial improvements re: getting docker-stack.yml during deploy step
2017-01-26 14:23:22 -08:00
Jay Linski 01f332f45c Fix missing closing tags (#1401) 2017-01-26 14:12:02 -08:00
Victoria Bialas ef6740f1f4 added links to docker-stack.yml source code file and reference back to intro topic
added instructions on how to directly download .yml file from GitHub

added more detail on how to get to a raw file in GitHub

further clarified how to get to and download the .yml file on GitHub

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-26 12:27:32 -08:00
Misty Stanley-Jones 0055c98052 Merge branch 'master' into fix-broken-link 2017-01-26 11:41:19 -08:00
Misty Stanley-Jones 9e29d0e03d Fix more broken links and images 2017-01-26 11:36:27 -08:00
Henryk Iwaniuk 182f8ab593 instructions do not apply to debian
debian does not have linux-image-extra-virtual  or  linux-image-extra-$(uname -r)  packages. the author might have used a debian based distribution.  debian kernels come with the aufs modules per default, no need to install extra packages.
2017-01-26 17:52:09 +01:00
Alexander List 75fd2ce7f0 software-properties-common is required for add-apt-repository
software-properties-common is not included in minimal server / cloud installs, and is required for the step "add-apt-repository" to work
2017-01-26 13:01:47 +01:00
Darwin Monroy 88d53f6c1e update sample output regarding package version information
On my ubuntu 16.04 it is shown as `1.13.0-0~ubuntu-xenial` instead of `1.13.0-0~xenial`
2017-01-25 22:41:23 -06:00
Victoria Bialas 8294aa51cb Merge pull request #1380 from docker/londoncalling-patch-1
Copy edits
2017-01-25 16:50:00 -08:00
LRubin df773d76e0 Merge pull request #1377 from Thoma5/patch-1
Fixed a typo
2017-01-25 16:43:52 -08:00
Victoria Bialas fe51bbff25 Copy edits
Removed duplicate text
2017-01-25 16:31:08 -08:00
Victoria Bialas 9adbe01bda getting started button format update, voting app services topic intro
added more concept definitions to intro topics

copy edit to clarify something

changed topic title

updated topic title in TOC as well

text formatting, re-push for new Jenkins

fixed installer download buttons in Getting Startd to specify a button type

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-25 15:10:01 -08:00
Thomas Mörbauer a29cfddbce Fixed a typo
Dcoker instead of Docker
2017-01-25 22:39:24 +01:00
Viktor Stanchev 6e1af718c7 remove reference to overlay2 as a filesystem
`overlay2` was incorrectly included as a filesystem that the `overlay` and `overlay2` storage drivers can't run on. `overlay2` is the name of the storage driver, but the filesystem is just called `overlay`. It was called `overlayfs` in older versions or the kernel, which would have helped disambiguate this, but I think we should continue to use `overlay` as the name of the filesystem because that's what the kernel uses now.
2017-01-25 13:20:45 -08:00
Alexey Voytenko 994f3fb9ee 'yum-config-manager' change flag to '--enable'
--set-enabled and --set-disabled changed to actual --enable and --disable. (--set-enabled may come from Fedora).
2017-01-25 13:10:03 -08:00
Misty Stanley-Jones 7d5a0f1011 Merge pull request #1337 from trapier/macvlan_intro
Remove experimental intro from macvlan (#1335)
2017-01-25 12:19:30 -08:00
Misty Stanley-Jones 5ff7b81590 Merge pull request #1368 from RonWilliams/patch-1
Fix language within devicemapper thinpool setup
2017-01-25 12:06:06 -08:00
Misty Stanley-Jones ef95a915eb Fixing broken links
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
C.X. Ling 49a333885d Fix rendering of code block for swarm tutorial (#1370)
Indentations are added to fix rendering failure.
2017-01-25 11:01:00 -08:00
Ron Williams 5bc72ac2ce Fix language within devicemapper thinpool setup
Previous language indicated that a user would be "creating a thin pool". This language is confusing as it indicates that the logical volume created is of the thin pool type; instead, the volume being created is a linear volume group which is then converted to a thin pool in step 6. This is an important nuance when implementing setup through configuration management tools such as Salt or Ansible. When initially provisioning the two logical volumes as thin pool, the error "Pool metadata LV docker/thinpoolmeta is of an unsupported type".
2017-01-24 21:22:10 -07:00
John Mulhausen 1a214fc716 Fixed MD source rendering 2017-01-24 17:30:13 -08:00
John Mulhausen 0f62e1ea3d Fixing infinite loop 2017-01-24 17:27:37 -08:00
John Mulhausen 0884ef36a5 Fixing some formatting snafus 2017-01-24 16:35:31 -08:00
John Mulhausen 77a908db5c Update zfs-driver.md 2017-01-24 15:47:02 -08:00
John Mulhausen af9e4ae9ef Update zfs-driver.md 2017-01-24 15:46:37 -08:00
Andreas Steinel 781a582fff Adding Quota option for ZFS (#1135)
* Adding Quota option

Try to explain how you can use quota on ZFS as it was implemented/discussed in #3804.

* Requested changes from @johndmulhausen
2017-01-24 15:41:52 -08:00
Thomas Auffredou 59034f94f0 Update log_tags.md (#1325)
Update reference url to logging context
2017-01-24 15:32:07 -08:00
James Hu f4ce265398 Update docker stack command (#1306)
There is no such thing as `docker-stack`
2017-01-24 15:31:07 -08:00
Edmundo Santos b3d4866cdd Fix broken link (#1347) 2017-01-24 14:50:48 -08:00
Robert Hudson cb94a4cc43 Update last_page.md (#1318)
Links written in this format: 
   [Getting Started with Docker for Mac](https://docs.docker.com/docker-for-mac/)
were not getting rendered. 
Changed to HTML.
2017-01-24 14:38:50 -08:00
Dominik-K 9b25ec62c0 resource_constraints.md: Fixed broken table format (#1348)
+ small typo fix
2017-01-24 14:32:45 -08:00
Misty Stanley-Jones 979cdc7186 Add several redirects (#1332) 2017-01-24 14:31:41 -08:00
Adrien Duermael 6129c4c255 remove apidocs/layouts after build (#1357)
* remove apidocs/layouts after build

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in swarm_manager_locking.md

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-24 14:26:04 -08:00
Misty Stanley-Jones 62c2c7eb1a Merge pull request #1334 from docker/mstanleyjones-patch-1
Fixed Markdown problem
2017-01-24 09:49:08 -08:00
Sebastiaan van Stijn 15697dab7a
fix link to logging context
this source file no longer exists on "master",
so replacing the link with a permalink on the
1.13 tag.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 15:36:59 +01:00
Misty Stanley-Jones dc42fddb45 Document swarm locking 2017-01-23 14:33:40 -08:00
Misty Stanley-Jones f6474ef8ce Update device-mapper-driver.md 2017-01-23 13:51:29 -08:00
Misty Stanley-Jones b0aa5f5c35 Update device-mapper-driver.md 2017-01-23 13:30:27 -08:00
Trapier Marshall 534bc0e0c2 Remove experimental intro from macvlan (#1335)
Opening sentence does not read after this sentence was migrated from
experimental.

Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-01-23 16:16:01 -05:00
Misty Stanley-Jones 680a3363d2 Fixed Markdown problem
Fixes #1333
2017-01-23 12:50:42 -08:00
John Mulhausen 38b088e051 Fixes #1317 2017-01-22 16:06:54 -08:00
Victoria Bialas 7a34f0fed3 Merge pull request #1303 from londoncalling/voting-app-sample-updates
updated tutorial tables, added links to 1.13.0 blog post
2017-01-20 18:10:42 -08:00
Victoria Bialas 8b68341c98 added voting app diagram svg for safe-keeping
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-20 17:58:07 -08:00
Misty Stanley-Jones 524692c7ad Add stack_ps to the TOC 2017-01-20 16:57:40 -08:00
Victoria Bialas 2338cb5c34 updated tutorial tables, added links to 1.13.0 blog post
copyedits

updated link to Compose file to go directly to V3 topic

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-20 16:31:22 -08:00
Morten Hekkvang 9093e0a454 Adding a dash at the end of `apt-key add` command
The dash at the end of the `apt-key add` command is important as it will otherwise expect to read from a file, and not `stdin`
2017-01-20 14:24:46 -08:00
Jérôme Petazzoni 9a3164a9d2 Add missing triple quote 2017-01-20 14:01:58 -08:00
Misty Stanley-Jones c74ac0ebd3 Update install instructions for RPM dists
Use 'makecache fast' instead of 'check-update'
Allow the repository manager to import the key instead of importing it first
2017-01-20 13:26:08 -08:00
Misty Stanley-Jones 35a80eb826 Merge pull request #1252 from thaJeztah/fix-centos-rhel-install-docs
Add yum-utils to installation instructions
2017-01-20 13:14:21 -08:00
nafg 8d18aa553e Corrections to ubuntu install docs, based on attempting to install on Wily
The apt repo layout seems wrong, it only worked after the proposed change.

Also apt-key seems to need `-` to look at stdin; otherwise I got `gpg: can't open `': No such file or directory`
2017-01-20 12:48:04 -08:00
paddyboyle fd94b9c2c4 Update systemd.md (#1185)
* take a stab at fixing a broken link

Signed-off-by: LRubin <lrubin@docker.com>

* Update systemd.md

Removed the quotes from the --graph option on line 130.  Using quotes works for version 1.12 of Docker but with 1.13, Docker will create a directory named <double-quotes> under / and then create a directory of mnt/docker-data" under that directory.
2017-01-20 12:12:26 -08:00
Miral Achmed ffcef3969b Update base image description (#1225)
* Update base image description

Update base image description on the table of Anatomy of the voting app section, on visualizer row.

* Correct caps
2017-01-20 12:07:27 -08:00
Bingshen Wang 0535560955 fix typo in btrfs-driver.md (#1173) 2017-01-20 11:52:26 -08:00
MAA b13718002c Smallish typo (#1220) 2017-01-20 11:51:40 -08:00
ljmsc f39fc023c7 Update index.md (#1231)
fix link to suse instructions
2017-01-20 11:50:39 -08:00
Sebastiaan van Stijn fc7baf8aa8 disable "testing" repos by default (#1253)
The documentation describes that the "testing" repository
is disabled by default;

> Optional: Enable the testing repository. This repository
> is included in the docker.repo file above but is disabled
> by default.

However, the repo-files had the testing repo enabled.

This patch updates the repo-files to disable the
repository by default.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-20 11:47:25 -08:00
Ben Firshman e1a8edffab Fix title in Engine API getting started (#1259)
* Fix title in Engine API getting started

A weird character was causing it to not be rendered correctly.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

* Update getting-started.md
2017-01-20 11:46:30 -08:00
John Mulhausen 88a190986a Fixes rendering problems 2017-01-20 11:37:14 -08:00
Misty Stanley-Jones 970dcdfdbd Merge pull request #1258 from stevenh/patch-1
Correct repository details for ubuntu install
2017-01-20 11:37:05 -08:00
LRubin e22150bd43 fix markdown (#1293)
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-20 11:32:19 -08:00
snesneros fa1b47d5d1 Close 'code' html elements (#1292)
There were missing slashes in the closing tags, causing the page to display incorrectly.
2017-01-20 11:26:37 -08:00
Misty Stanley-Jones 79a97249a7 Added some redirects (#1294) 2017-01-20 11:24:36 -08:00
John Mulhausen 70ce9db6f0 Update understanding-docker.md 2017-01-20 11:23:39 -08:00
Misty Stanley-Jones 2f2bcbe1b2 Merge branch 'master' into patch-1 2017-01-20 09:50:52 -08:00
Misty Stanley-Jones fd3524cd3a Merge branch 'master' into use-fixed-releasever 2017-01-20 09:23:56 -08:00
Misty Stanley-Jones 4f60e41d46 Correct Ubuntu repo URL 2017-01-20 09:11:53 -08:00
Bartomeu Miró 1e26fa0775 FIX repo URL at add-apt-repository
With the past version the apt-get update results in a 403 for the docker repository when using a Jessie. Looking at the repo structure I assume that now will also work on the other Debian releases.
2017-01-20 16:14:58 +01:00
Steven Hartland 05ca25b53f Correct repository details for ubuntu install
Correct the ubuntu apt repository to use the correct form ubuntu-<codename>
2017-01-20 13:34:48 +00:00
Sebastiaan van Stijn 6e310517ef
Use fixed $releasever for CentOS / RHEL
The repo-files used in the installation instructions currently use `$releasever`
to configure the right YUM repository to use, however _Server_ releases output
the version in a different format (i.e., `7Server` instead of just `7`).

Given that we don't have separate repositories for "Server" and "Desktop" editions,
and we only support version 7, setting the repo-files to use a fixed version.

This issue was originally reported in
https://github.com/docker/docker/issues/23376

And fixed through 2b36087597, but this change
got lost during the rewrite of the installation docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-20 14:13:22 +01:00
Sebastiaan van Stijn 2dfaf2c4e4
Add yum-utils to installation instructions
The yum-utils package is not installed by default
on some cloud providers, causing the
`yum-config-manager --add-repo` step to fail.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-20 13:59:29 +01:00
Misty Stanley-Jones d137e8a245 Fix a couple more instances of SUSE.md (#1223) 2017-01-19 23:50:12 -08:00
John Mulhausen 1a8ff37edb Update stack-deploy.md 2017-01-19 23:48:54 -08:00
John Mulhausen 2306a69da8 Update dockerd.md 2017-01-19 23:48:13 -08:00
John Mulhausen f7f35a3824 Update sdks.md 2017-01-19 23:47:44 -08:00
John Mulhausen de2a379e37 Remove dupe titles (#1217) 2017-01-19 23:25:34 -08:00
Misty Stanley-Jones 493b7b6157 Renamed SUSE.md to suse.md (#1222) 2017-01-19 23:25:14 -08:00
Victoria Bialas 0796130ef3 changed heading back to original title
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 23:05:03 -08:00
Victoria Bialas 69b7379c0b updated title of tutorial first topic
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 22:55:03 -08:00
Victoria Bialas 18beee2c81 fixed a link to Docker Labs
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 22:47:10 -08:00
Victoria Bialas 19589d48cf Merge pull request #1191 from londoncalling/voting-app-example-draft2
draft 3 voting app sample updates
2017-01-19 22:25:43 -08:00
Victoria Bialas 3b314c12db draft 3 voting app sample updates
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 22:14:44 -08:00
John Mulhausen d8fcf8ae85 Nav fixes 2017-01-19 22:12:26 -08:00
Victoria Bialas 2c302845e1 improved Compose v3 and surrounding intro topics and links
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 21:34:35 -08:00
Victoria Bialas 426ea700ce voting app example updated Compose v3 features
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 21:34:35 -08:00
Victoria Bialas 0d31b7e17c complete first draft example, add new files and images
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 21:25:05 -08:00
Victoria Bialas db455a43bc uupdates to node and swarm setup, and deploy topics
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 21:25:05 -08:00
Victoria Bialas 08df6cea16 added node setup, create swarm, deploy topics to voting app example
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 21:25:04 -08:00
Victoria Bialas 58220bcf61 added more steps to app walkthrough
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 21:25:04 -08:00
Victoria Bialas 4dad83c742 tutorial on multi-container apps w/voting app
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 21:25:04 -08:00
Misty Stanley-Jones 00d68e59ea Merge pull request #1188 from docker/linkfix-john
Link fixes and link to app tutorial
2017-01-19 12:27:37 -08:00
Misty Stanley-Jones 584acf397b Fix a couple of Liquid errors 2017-01-19 12:06:33 -08:00
John Mulhausen 41587fabc1 Restructure navigation for Editions 2017-01-19 11:59:28 -08:00
Misty Stanley-Jones 988d920d36 Addressing feedback from new installation instructions (#1172)
* Address feedback for new installation instructions

* Updating the repo files for Oracle since  does not expand to only the number
2017-01-19 11:27:37 -08:00
Misty Stanley-Jones 7734148070 Fix typo in Oracle install instructions 2017-01-19 11:27:36 -08:00
Misty Stanley-Jones 50e75ff936 Rewrite and reorganize Linux install instructions
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-01-19 11:27:32 -08:00
Misty Stanley-Jones d2bd1457b5 Merge pull request #1069 from mstanleyjones/examples_to_cli_temporary_fix
Add examples to CLI generation templates
2017-01-19 11:21:05 -08:00