Commit Graph

623 Commits

Author SHA1 Message Date
Misty Stanley-Jones 1346c7f56a Merge pull request #1657 from mathieui/engine-commandline-markdown
Fix a markdown rendering issue
2017-02-14 11:03:11 -08:00
Brian Kaufman 34b5b993ca Default docker log name is container ID
The default docker log name is the 12 character container ID, the sample test.conf setup above filters for Docker.* which will not pick anything up unless users start their containers with at "Docker" tag
2017-02-14 12:53:12 -05:00
mathieui 3e713f6359 Fix a markdown rendering issue
The first snippet for “Create a docker service with specific hostname” is not properly rendered in the official docs: https://docs.docker.com/engine/reference/commandline/service_create/#/create-a-docker-service-with-specific-hostname---hostname
2017-02-14 18:24:54 +01:00
scjane cc1ddf3c6d Update step_six.md 2017-02-14 17:29:30 +08:00
Misty Stanley-Jones 551b30f319 Add info about backing up swarms
A little reorganization and clean-up along the way
2017-02-13 17:19:45 -08:00
Misty Stanley-Jones 0b663b1042 Merge pull request #1616 from cliffwoolley/patch-1
Fix Markdown; no need to install curl twice
2017-02-13 16:49:43 -08:00
Misty Stanley-Jones 15980561e7 Merge pull request #1618 from cheuberg/patch-1
Fix markdown error
2017-02-13 16:48:51 -08:00
Misty Stanley-Jones faa469f4b7 Merge pull request #1619 from hoatle/patch-1
fix typo: redploy => redeploy
2017-02-13 16:48:17 -08:00
Misty Stanley-Jones 99767cb51f Merge pull request #1620 from shubheksha/patch-1
Fix minor typo in step_four.md
2017-02-13 16:47:15 -08:00
Misty Stanley-Jones 141c2696c7 Fix a typo 2017-02-13 12:59:16 -08:00
Shubheksha Jalan 5a82021e47 Update step_four.md 2017-02-13 13:11:12 +05:30
Hoat Le 10f0f30ed3 fix typo: redploy => redeploy 2017-02-13 08:44:39 +07:00
cheuberg 9298767020 Fix markdown error
Previous version did not render correctly.
2017-02-12 14:54:20 +02:00
Cliff Woolley 5ad417ad37 Fix Markdown; no need to install curl twice 2017-02-11 11:28:45 -08:00
Nilz11 c1e6b41b47 Update debian.md
Fix for command
2017-02-11 15:46:05 +01:00
Victoria Bialas 1f4fb56733 updated diagram to match Design provided colours and shapes
updated diagram to soften connectors in diagram to lighter grey

modified db boxes on diagram

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 17:49:47 -08:00
Misty Stanley-Jones afef955a13 Linux installation improvements (#1560) 2017-02-10 11:31:50 -08:00
Pascal Andy adf14bbba3 Fix and issue with CMD docker exec
docker exec $(docker ps --filter name=redis -q)

not docker exec $(docker ps --filter --name=redis -q)

Cheers!
2017-02-10 11:13:12 -05:00
John Mulhausen d416168b31 Update index.md 2017-02-09 23:50:15 -08:00
Justyn Shull c59f972f46 Update secrets.md - fix typo (#1574)
rottate -> rotate
2017-02-09 12:19:37 -08:00
Misty Stanley-Jones 63ca90797d Merge pull request #1543 from ArcticSnowman/master
Update example for --syslog-address for unix path
2017-02-08 19:05:34 -08:00
Misty Stanley-Jones 45aa25c0c6 Merge pull request #1547 from jefferybradberry/patch-2
Update services.md
2017-02-08 19:04:49 -08:00
Avi Miller 644ee5f294 Remove Oracle Linux issues
Neither of the documented issues are still an issue on current versions of Docker on Oracle Linux.
2017-02-09 13:44:02 +11:00
Sravan S 8b8c8e2d0c Update repository setup step for Linux Mint users (#1537)
* Update repository setup step for Linux Mint users

Add a note to remind people using distributions derived from Ubuntu(Linux Mint)
to change the ubuntu-$(lsb_release -cs) part to their parent Ubuntu release. 

The output of $(lsb_release -cs) won't necessarily be a stable Ubuntu release, it would
sometimes be something like 'rafaelia' and there could be problems in the installation
2017-02-08 17:01:27 -08:00
Abhishek Kandoi f6e3e14e84 Fix typo (#1557)
Change intall to install
2017-02-08 13:26:41 -08:00
Victor Vieux 80fa030ffd bump engine API to 1.26 (#1553)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-08 13:18:24 -08:00
Jeffery Bradberry a9da7672a5 Update services.md 2017-02-07 14:14:05 -05:00
Steven Arnott 7823e98796 Update example for --syslog-address for unix path
Update example for --syslog-address for unix path to include 'unix:' protocol that is needed.
2017-02-07 12:54:14 -05:00
Ryan Sanford d91cab01bc Fix base image creation example commands (#1409)
Example commands for creating a base image do not work due to multiple issues.
- 16:04 not a valid tag for ubuntu image
- apt-get install fails without preceeding `apt-get update`
- gcc command fails without `-nostartfiles` flag
- `docker run` without the `--rm` leaves behind containers which is unintuitive, and inconsistent with the build image used above.
2017-02-07 09:52:31 -08:00
Misty Stanley-Jones 9420f4cc89 Merge pull request #1429 from Mic92/patch-1
zfs: fixed assumptions about thin provisioning
2017-02-07 09:50:07 -08:00
Sivakumar Raja a0009fbada Corrected a typo and error in docker start command (#1508)
* Corrected a typo in Fedora install instructions

* Removed the change on docker start command.

Changed the command from `sudo systemctl start docker` to `sudo systemctl docker start` as it was addressed on other PR, so leaving it to the original one.
2017-02-07 09:38:22 -08:00
Misty Stanley-Jones ef2c5002ca Merge pull request #1375 from vikstrous/patch-1
remove reference to overlay2 as a filesystem
2017-02-06 17:13:05 -08:00
Misty Stanley-Jones 6ed0295440 Merge pull request #1382 from dmonroy/patch-1
update sample output regarding package version information
2017-02-06 17:12:11 -08:00
Misty Stanley-Jones b8525d459d Merge pull request #1386 from alexlist/patch-1
software-properties-common is required for add-apt-repository
2017-02-06 17:11:15 -08:00
tradfor 4d01901e7c Added a new remove unofficial docker step (#1468)
* Added a new remove unofficial docker step
2017-02-06 17:01:44 -08:00
huangsen365 76461f517e Update centos.md (#1523)
* Update CentOS, RHEL, Fedora instructions for starting Docker
2017-02-06 16:55:29 -08:00
Joao Fernandes 8eddd3f80f Merge pull request #1526 from aboch/esp
Fix docs about what protocol must be allowed for network encryption
2017-02-06 14:24:16 -08:00
Alessandro Boch 649210111a Fix docs about what protocol must be allowed for network encryption
- This was inadvertently changed to `port`

Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-06 10:04:31 -08:00
Adam Eijdenberg 9d2b5f32bb Add documentation around pipefail to address issue 1459 (#1460)
* Add documentation around pipefail to address issue 1459

Signed-off-by: Adam Eijdenberg <adam.eijdenberg@gmail.com>
2017-02-06 09:52:19 -08:00
Victoria Bialas 11363d7582 Merge pull request #1475 from docker/londoncalling-patch-3-1
add a link to the voting app sample
2017-02-03 16:49:27 -08:00
Victoria Bialas 49d3957e47 Update last_page.md 2017-02-03 14:30:37 -08:00
Misty Stanley-Jones 811aa5d54a Merge pull request #1437 from onelovelyname/patch-1
Add instructions for manual start of Docker daemon
2017-02-03 13:49:22 -08:00
Melanie Gin 752d79f3ee Add instructions for manual start of Docker daemon 2017-02-03 13:37:25 -08:00
Misty Stanley-Jones f46129b40c Merge pull request #1449 from Rick-Anderson/patch-3
Update faq.md
2017-02-03 11:13:22 -08:00
Daniel Suo 9e5e14f0e6 Add link to C SDK 2017-02-03 11:17:46 -05:00
Misty Stanley-Jones ad900b3f07 Merge pull request #1470 from JamesDrummond/patch-1
Update ubuntu.md
2017-02-02 13:30:21 -08:00
Misty Stanley-Jones 8d3145ff3b Add an automatic TOC to pages that don't have no_toc in front-matter 2017-02-01 19:49:07 -08:00
Victoria Bialas 6171ffce72 add a link to the voting app sample
* Added a link to the voting app sample from the Getting Started tutorial "learn more" list of topics
2017-02-01 16:24:28 -08:00
Victoria Bialas 27106d338c linked to "service" definition in glossary, edits
* added a link to the glossary definition for "service"
* improved wording on description of what a service is, inline here
2017-02-01 15:14:21 -08:00
Victoria Bialas d404e6f134 Update customize-app.md 2017-02-01 14:21:54 -08:00
Victoria Bialas 3a877398f1 Merge pull request #1469 from londoncalling/more-voting-app-tweaks
improved voting app intro
2017-02-01 14:12:19 -08:00
James Drummond bd3cda58b4 Update ubuntu.md
Added line `apt-get install software-properties-common` to install packages that include `add-apt-repository`.
2017-02-01 15:39:01 -06:00
Victoria Bialas e4f06be4b8 improved voting app intro
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-01 12:32:59 -08:00
Misty Stanley-Jones 1277302ce0 Merge pull request #1457 from stevemao/patch-2
hello-world is an image
2017-02-01 11:14:44 -08:00
Rick Anderson 47aa2c597a VMs vs. containers (#1439)
* VMs vs. containers

Containers can also partition hardware, it's the OS isolation that really differentiates them.
2017-02-01 09:17:18 -08:00
Victoria Bialas 51c9655cca Merge pull request #1458 from londoncalling/voting-app-tweaks
updates to voting app for better readability
2017-01-31 22:42:39 -08:00
Victoria Bialas 02ee9e0800 updates to voting app for better readability
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-31 21:58:46 -08:00
Steve Mao a026aa3be8 hello-world is an image 2017-02-01 15:35:21 +11:00
Rick Anderson 706c659f55 react to feedback 2017-01-31 15:51:29 -10:00
Misty Stanley-Jones 7d9b7e0672 Merge pull request #1452 from docker/oracle_install_edits
Remove redundant sentence fragment
2017-01-31 16:35:19 -08:00
Misty Stanley-Jones ba231c7559 Merge pull request #1364 from nathanleclaire/why_d4a
Add 'Why Docker for AWS/Azure' doc
2017-01-31 16:29:54 -08:00
James Wang 9b472dc8ba Update baseimages.md (#1453)
Docs used a `:` instead of a `.` for `ubuntu:16.04`.
2017-01-31 16:27:30 -08:00
Misty Stanley-Jones 53a7608acb Merge pull request #1418 from nathanleclaire/one_concern_per_container
Fix "one process per container" -- Add touchups to Dockerfile best practices
2017-01-31 16:20:48 -08:00
Misty Stanley-Jones 18405f86c4 Remove redundant sentence fragment 2017-01-31 15:55:44 -08:00
Nathan LeClaire 2b7dd30419 Add 'Why Docker for AWS/Azure' doc
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-31 15:24:39 -08:00
Rick Anderson bf8a631174 Update faq.md
Reduce RO sentences and minor cleanup.
2017-01-31 12:11:20 -10:00
Nathan LeClaire 998ad7b90e Add touchups to Dockerfile best practices
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-31 13:17:08 -08:00
Quentin Pleplé 916b7a970a Indentation issue (#1427) 2017-01-30 14:38:43 -08:00
Peio Roth c567dccf46 Fix doc typo in compose examples (#1431) 2017-01-30 14:36:31 -08:00
Jörg Thalheim f3ed8a80ab zfs: fixed assumptions about thin provisioning
unlike lvm thin provisioning is fast and does not slow down the filesystem
2017-01-30 12:25:04 +01:00
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