Merge master into vnext-swarm #431
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add ELK stack example to UCP logging
Update docker/dtr image reference
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Update 3_prepare_the_app.md with missing dots
…in-machine-docs incorporated Misty's rewrite from pr#256 with additional info
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
added beta 29 release notes for mac and win
Corrected the uninstall command to make it copypasteable (it was missing a \ at the end of the volume argument) and also updated the expected output to include the WARN messages that will appear. Also corrected ordered list numbering (cosmetic only while editing)
Add doc for firewall auto-detection
Signed-off-by: LRubin <lrubin@docker.com>
Signed-off-by: LRubin <lrubin@docker.com>
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
update autotest descriptions
finishing touches on Wordpress example in Compose docs per pr#129
Docker Cloud: update tag mapping label, some typo fixes
Signed-off-by: LRubin <lrubin@docker.com>
Docker Cloud: updates for multiple email address management
Revert "Doc change to support custom userdata option for docker-machine AWS driver"
Changing note format back to the way it was to match the rest of the notes in this section.
Added a filename above the custom script to distinguish it from the wait-for-it.sh script.
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Signed-off-by: Matt Bentley <matt.bentley@docker.com> (cherry picked from commit 91c2270026f35ce27a9d0c23c27b9bdf4cdbb2c9)
(cherry picked from commit e2809745101b87640b7c671dd14c1dfbc9c794a2)
(cherry picked from commit a2b6185efc2bc78b794fc85f75b3ef4fdfc933f1)
(cherry picked from commit 117740117bf719039cc43dc77a110c9e22fbbead)
(cherry picked from commit 369e6d3e646a51eb65ff5d8291c8c0cf7ef90860)
(cherry picked from commit 224afea59b0ab5bedbff53c574da286991864fe8)
(cherry picked from commit 5f5c931ff99968ee8adf420d43856b964f93e680)
(cherry picked from commit a71ab3fb85e09a389714490678ba4e94514c449a)
(cherry picked from commit 46cdf5a8b80791f6d1cb6462dd66e23266a06d33)
(cherry picked from commit adaa077d3cecdfd71bcb640cef942086e4a42d9a)
absolute links to docs.docker.com are now relative links
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
clarify how to use Windows containers and Windows Server 2016
Fix regex capture groups syntax
fix: Add line breaks before and after code blocks
Migrates DTR 2.0 docs with history
CLOUD-3129 Docker Hub: update hub docs to include cancel button
Migrates UCP 1.1 docs with history
joaofnfernandes
pushed a commit
to joaofnfernandes/docker.github.io
that referenced
this pull request
Nov 11, 2016
- Close docker#194 and fix - Fix and close docker#425 - Fix and close docker#417 - Fix and close docker#420 - Fix and close docker#422 - Adding in documentation build scripts - Fix and close docker#431 - Fix and close docker#438, and Fix and close docker#429 - Work on 441 - Adding in commands reference - Updating all the options to tables - Updating per Vivek docker#498 - Adding vivek's last suggestions Signed-off-by: Mary Anthony <mary@docker.com>
joaofnfernandes
pushed a commit
to joaofnfernandes/docker.github.io
that referenced
this pull request
Apr 16, 2018
* Bump DTR version * Update _config_authoring.yml tokens to match main _config.yml
JimGalasyn
pushed a commit
that referenced
this pull request
Apr 16, 2018
* Bump DTR version * Update _config_authoring.yml tokens to match main _config.yml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the proposed changes
Picking up recent fixes since the migratino
Project version
swarm-next
Related issue
n/a
Related issue or PR in another project
n/a
Please take a look
@johndmulhausen @thaJeztah