Commit Graph

1094 Commits

Author SHA1 Message Date
Xianlu Bird 903df7ebfc Fix published&target description in ports section (#3016) 2017-04-26 20:52:14 +00:00
Daniel Maslowski 50e9e49552 Note on mixing network_mode with links in Docker compose file (#3049) 2017-04-26 20:50:47 +00:00
John Mulhausen f2cb46bf05 Fixes #3076 2017-04-26 13:33:54 -07:00
Lenny Linux 9a1f99cd11 add warning class and a linebreake to the warning blogquote (#2937)
* Update fedora.md

add warning class to blogquote

* Update linux-postinstall.md

add warning class to blogquote

* Update ubuntu.md

add warning class to blogquote

* Update https.md

add warning class to blogquote

* Update swarm_manager_locking.md

add warning class to blogquote

* Update dockerlinks.md

add warning class to blogquote

* Update deploying.md

add warning class to blogquote

* Update deploying.md

add warning class to blogquote

* Update insecure.md

add warning class to blogquote

* Update discovery.md

add warning class to blogquote

* Update dockerd.yaml

add warning class to blogquote

* Update docker_secret_rm.yaml

add warning class to blogquote

* Update docker_service_rm.yaml

add warning class to blogquote

* Update docker_secret_rm.yaml

add warning class to blogquote

* Update scale-your-cluster.md

add warning class to blogquote

* Update resource_constraints.md

add warning class to blogquote

* Update binaries.md

add warning class to blogquote

* Update content_trust.md

add warning class to blogquote

* Update secrets.md

add warning class to blogquote

* Update index.md

add warning class to blogquote

* Update install-sandbox-2.md

add warning class to blogquote

* Update docker-toolbox.md

add warning class to blogquote

* Update index.md

add warning class to blogquote

* Update centos.md

add warning class to blogquote

* Update debian.md

add warning class to blogquote

* Update faqs.md

add linebreak after Looking for popular FAQs on Docker for Windows?

* Update install.md

add linebreake after **Already have Docker for Windows?**

* Revert "Update dockerd.yaml"

This reverts commit 3a98eb86f700ade8941483546c33f69a9dab8ac3.

* Revert "Update docker_secret_rm.yaml"

This reverts commit 5dc1e75f37033932486c11287052b7d64bf83e55.

* Revert "Update docker_service_rm.yaml"

This reverts commit a983380a5625b471f1a03f8ed2301ead72f98f1b.

* Revert "Update docker_secret_rm.yaml"

This reverts commit 4c454b883c300e26fbb056b954bb49ec2933b172.
2017-04-25 11:33:27 -07:00
Victoria Bialas 5c2b6663c4 Windows server 2016 Compose install, Compose file format updates (#3035)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-25 10:44:34 -07:00
Victoria Bialas df4892c964 update re:container_name not supported in v3 Compose (#3003)
* update re:container_name not supported in v3 Compose

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added container_name to list of removed v3 options

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* corrected  definitions per reviews

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* listed unsupported suboptions for deploy key

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-24 11:47:18 -07:00
Jonas B. Nielsen 82cf41f6f5 Links to compose file information terminates with 404 (#3011)
I have corrected the link in two places to what I expect to be the right resource.
2017-04-24 09:22:36 -07:00
John Harris f179037853 Clarify Swarm vs swarm mode with compose capabilities (#3008) 2017-04-23 11:44:11 -05:00
Germán Larraín 958fb121b0 django.md: fix Python image version (#2991)
Dockerfile's base image was not consistent the the explanation below.
2017-04-21 23:59:02 -07:00
Krassimir Valev a6ee7cfefe Fixed networks identation issues (#2989) 2017-04-21 23:58:05 -07:00
Julien Maitrehenry 3edabae435 Fix manager and worker join tokens
* Fix manager and worker join tokens. Issue #2088.

Fix screenshots per issue #2126

Move vote images to correct dir

Fix rendering issue with inline code snippet #1990

Fix for stack yaml reference (#1476)

Fix image link

Add shutdown procedures for #1017

* Make the fix asked in the PR

Little fix
2017-04-21 14:05:12 -05:00
Suraj Narwade 28fdfd3b28 added `$` in commands (#2926)
resolves #2925
2017-04-21 11:17:39 -05:00
Bill a3a7ae1e0b replaced docker/docker with moby/moby (#2879)
* replaced docker/docker with moby/moby

* fixed incorrect name changes in release notes

* fixed mentions of moby/moby in code
2017-04-20 15:32:18 -05:00
Suraj Narwade 553db19401 Explains order of precedence between env-file and env (#2903)
Resolves #1312
2017-04-20 15:29:00 -05:00
Suraj Narwade e7c16b5fdc separate out the links (#2935)
* separate out the links

resolves #2934

* Update gettingstarted.md
2017-04-20 15:00:32 -05:00
Cory Locklear fb33155fc7 Fixes #1097. Add alert for potential edit of settings.py for ALLOWED_HOSTS for Windows 10 (#2886) 2017-04-20 12:07:58 -05:00
Jarrod Pooler 9c4f7e09af Update bash completion steps and add MacPorts steps (#2910) 2017-04-20 11:44:20 -05:00
Victoria Bialas b07dc066dc copyedits, reformat commands, updates for versions (#2942)
updated bash script wrapper commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-20 01:17:08 -05:00
Suraj Narwade 09eee26ef3 fixes command execution ambiguity in compose/install.md (#2905)
* fixes command execution ambiguity in compose/install.md

Resolves #1678

* copyedit to kick build
2017-04-20 00:15:19 -05:00
Suraj Narwade be37ddd557 Adding documentation for restart policy (#2912)
Resolves #1353
2017-04-19 17:05:02 -05:00
Shubheksha Jalan 2ec7b0d591 Remove deprecated --all option for `docker-compose rm` (#2821)
* remove --all from docker-compose rm
2017-04-19 14:49:25 -05:00
Suraj Narwade db6a60b806 Fixed django example (#2914)
Resolves #2468
2017-04-19 14:18:05 -05:00
Shubheksha Jalan d1308508e0 Make install instructions for Docker Compose clearer (#2814)
* clarify install instructions

* add direct install instructions for Ubuntu

* remove apt-get install instructions

* Edits
2017-04-19 07:03:20 -05:00
Rubab-Syed bdcd3be43c Add note that compose v3 doesnt support additional ipam configs (#2858)
* Add note that compose v3 doesnt support additional ipam configs (#1528)

* Fix minor tick (#1528)

* Edits
2017-04-19 07:00:23 -05:00
Shubheksha Jalan 7245c83c17 Add the --fail to `curl` commands when installing compose (#2817)
* Add the fail option to curl commands when installing compose

* move --fail to the beginning of the command for readability
2017-04-18 17:39:37 -05:00
Jesse Adametz 2dcd8d55a3 Clarifies compose push destination and requirements (#2843)
* Clarifies compose push destination and requirements

* Edits
2017-04-18 16:07:57 -05:00
Constanze Kratel 0cdec66639 Update composefile versions and quotes in examples
Changed version from 2 to 3, updated quotation marks to match example, changed front and back to frontend and backend.
2017-04-18 13:43:57 -07:00
Bhavin Gandhi 386d6dc6f7 Fix missing database user for Wordpress service (#2824)
* Fix missing database user for Wordpress service

It defaults to root if not specified. https://hub.docker.com/_/wordpress/

* Change root password to avoid confusion.
2017-04-18 13:03:08 -07:00
John Mulhausen 8820cfa6ff New 6-page "Get Started" (#2296)
* Create index.md

* Create part2.md

* Create part3.md

* Create part4.md

* Create part5.md

* Rewrite step 2

* Update part2.md

* Update part2.md

* Update part2.md

* Update part2.md

* Update part2.md

* Update part2.md

* Update index.md

* Rewrite of part 3

* Tabs-based swarm instructions, pass 1

* Rewrite of parts 3 and 4, tabs implementation

* Navigation, rewrites, part 4 completion

* Part 5 w/Redis

* Part 5, compelte Redis, rename part 6

* TOC/redirect implementation

* Update part6.md

* Changing links to point to new tutorial

* Rewrites and asciinemas

* Fix overview

* Label diagrams

* Fix button

* Fix link to where Stacks are covered

* Fix typo

* s/file/directory

* Reformat paragraph

* Shorten tabs

* Typos

* Release DTR 2.2.4, 2.1.6

* Go back to small /edge (#2736)

* Go back to small /edge

* Update site front page

Add info about Editions
Reorganize components
Update headings

* Move logic of fetching content to a script

* Add v1.28 API

* Add info about versioned API

* Fix a few 404s (#2785)

* Fix typo

* Propose use of another word (#2791)

I think that interested is better than invested, in this case.

* Update secrets.md (#2780)

remove correct secret

* Change mount syntax on windows from //c/ to c:\ (#2761)

LGTM

* Update hackathon.md (#2773)

* nodes.md grammar correction (#2802)

* Grammar and formatting check (#2797)

* Wrong article

If the first word starts with a vowel sound you use an. If the first word has a consonant sound use a.

* Making the text bold

Removing backticks because probably the text needs to be bold and not marked as code.

* Update overview.md (#2805)

It should say 'predecessors', not 'successors'. Otherwise the sentence and the subsequent example don't make sense.

* shrink some big images (#2798)

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>

* #2627 (#2804)

- Fix right sidebar overflow on rescale

* Update hackathon.md

* change pre-build to pre_build to remove confusion (#2813)

* change pre-build to pre_build to remove confusion

* clarify that pre_build hook refers to a file

* Update TOC to sentence case (#2790)

* add more info about DTR on the overview page (#2794)

fix #1904

* Update glossary.yaml (#2807)

Fix #2575.

* fix imports since docker api pkg migration, fix example repository name to be canonical (#2806)

* tweak: code format for filename (#2829)

* tweak: code format for filename

slight reword, so as to avoid confusion w/filename

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* small changes just to kick build again

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Update hackathon.md

* fix broken links (#2808)

* fix broken link (#2809)

* [CONTRIBUTING] update broken link (#2826)

* [Debian] add gnupg2 requirement for stretch (#2823)

* TOC/redirect implementation

* Changing links to point to new tutorial

* Rewrites and asciinemas

* Fix bad merge

* Metadata, formatting

* Front page formatting, link instrumentation
2017-04-18 03:32:37 -05:00
padoo fabedfbc8b Update overview.md (#2805)
It should say 'predecessors', not 'successors'. Otherwise the sentence and the subsequent example don't make sense.
2017-04-16 17:00:39 -07:00
John Mulhausen add2f680e8 Default highlight.js off, dockerfile > conf highlighting, pygments (#2757)
* Default highlight.js off, dockerfile > conf highlighting, pygments

* Address feedback, style changes, markdownify reductions

* Getting rid of more markdownify

* Fix for right-hand nav spacing
2017-04-13 17:10:29 -07:00
Luis Bosquez fe5b942a0f Adding ASP.NET Core + SQL Server Compose Tutorial (#1536)
Adding Docker Compose sample for getting started with an ASP.NET Core
web application running SQL Server on Linux in the backend. This sample
can be used in Docker for Linux, Windows and Mac using Docker-Engine.
Note: This sample doesn't use Windows Containers.
2017-04-12 12:26:40 -07:00
xufei100 a8a33c1d07 Update compose-file-v2.md (#2702)
fix wrong link
2017-04-10 12:40:09 -07:00
Victoria Bialas 49c5bd7b6e updates for Compose group_add example (#2684)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-07 12:45:19 -07:00
Victoria Bialas 61aa60d039 clarified relationship btwn scale and replicas (#2683)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-07 11:38:21 -07:00
Jim Galasyn 1654a09c72 Fix broken samples link (#2682)
Replaced missing samples link with links to Getting Started and GitHub example files
2017-04-07 10:22:44 -07:00
mrfly 8316c1d0be There is a colon omitted in this section. (#2631) 2017-04-06 15:33:20 -07:00
Victoria Bialas 5f14289a3f added note re: VitualBox bug and Compose example (#2652)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-06 13:41:12 -07:00
Misty Stanley-Jones 2f4355c22a Fix compose links (#2624) 2017-04-04 15:03:50 -07:00
Misty Stanley-Jones 4fd4685ec5 Fix 404 (#2622) 2017-04-04 15:03:02 -07:00
Misty Stanley-Jones 3833596740 Adjust heading level (#2620) 2017-04-04 14:26:45 -07:00
Wang Jie 75d5a853e2 Update production.md (#2590)
* Update production.md

* Update production.md
2017-04-03 15:23:03 -07:00
Wang Jie d2974a5d3b Update startup-order.md (#2591) 2017-03-31 23:42:38 -07:00
Wang Jie a3417b8126 Update install.md (#2574) 2017-03-31 15:31:02 -07:00
Wang Jie a5502b4235 Update gettingstarted.md (#2576) 2017-03-31 14:22:01 -07:00
Wang Jie 15924442bb Update install.md (#2577) 2017-03-31 14:20:56 -07:00
Wang Jie 2b009778e3 Update overview.md (#2578) 2017-03-31 14:20:30 -07:00
Wang Jie fd5090abb4 Update envvars.md (#2579) 2017-03-31 14:16:58 -07:00
Wang Jie 0078fcb96b Update overview.md (#2554) 2017-03-30 16:56:47 -07:00
Misty Stanley-Jones c6aca8acee Improve bootstrap tabs (#2546)
Use data-target instead of href
Move tab-syncing code into site-wide JS so everyone can use it
Add example for syncing tab groups on the same page
2017-03-30 12:57:37 -07:00