Merge master into vnext-opensource #430

mdlinville · 2016-11-02T18:53:06Z

Describe the proposed changes

Pick up recent fixes since the migration

Project version

opensource next

Related issue

n/a

Related issue or PR in another project

n/a

Please take a look

@johndmulhausen @thaJeztah

Add ELK stack example to UCP logging

Update docker/dtr image reference

Signed-off-by: Victoria Bialas <[email protected]>

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 <[email protected]>

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 <[email protected]>

Signed-off-by: Victoria Bialas <[email protected]>

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 <[email protected]>

…ne AWS driver"

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 <[email protected]>

(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 <[email protected]>

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

thaJeztah · 2016-11-02T18:55:20Z

.mailmap

@@ -1,254 +0,0 @@
-# Generate AUTHORS: hack/generate-authors.sh


Are we not going to do an AUTHORS file?

I have no idea, but we removed that in master so removing it here. We don't have that whole hack directory. Can you raise a separate PR and explain what the AUTHORS file is for, so we can see if we need it for the docs repo? Please assign it to John.

thaJeztah · 2016-11-02T19:04:19Z

engine/examples/mongodb.md

-    # Expose port 27017 from the container to the host
-    EXPOSE 27017
+```dockerfile
+# Expose port 27017 from the container to the host


Hm, something we should fix "expose" doesn't actually expose, it only adds metadata to the dockerfile to describe that the image "exposes" a certain port (it's used for the -P (publish all) option)

OK, but that's not really in scope for this PR.

thaJeztah · 2016-11-02T19:05:12Z

engine/examples/mongodb.md

-> **Note:**
->
-> The full version of this `Dockerfile` can be found [here](https://github.com/docker/docker/blob/master/docs/examples/mongodb/Dockerfile).
+> **Note:**  The full version of this `Dockerfile` can be found [here](https://github.com/docker/docker/blob/master/docs/examples/mongodb/Dockerfile).


Looks like we need to update this URL

Created #434 for this, since it has nothing to do with this specific merge.

thaJeztah · 2016-11-02T19:13:26Z

engine/reference/commandline/dockerd.md

 ```json
 {
-	"authorization-plugins": [],
-	"dns": [],


these are gonna be tricky when merging back to docker/docker, because I think new options were added

They won't be merged back at all. Instead, the contents will be re-copied from docker/docker at some point in the future, at which point the newly added options would show up.

thaJeztah · 2016-11-02T19:15:51Z

engine/reference/commandline/build.md


-Instead of specifying a context, you can pass a single Dockerfile in the `URL`
-or pipe the file in via `STDIN`. To pipe a Dockerfile from `STDIN`:
-


Not sure this should be removed

This was done in 7b41a45 which may need to be reverted in master. I'll check into it.

thaJeztah

Found one change that we need to check, and some non-related changes that we may want to look into on master

thaJeztah

LGTM

Few tweaks on check Update with comments from Dan Last comments;fix some build breaks Tighten language add reconfigure info Signed-off-by: Mary Anthony <[email protected]>

* Add DTR 2.5 release notes * Add redirect

joaofnfernandes and others added 30 commits October 25, 2016 15:20

Merge pull request #239 from vsaraswat/patch-2

0888a73

Add ELK stack example to UCP logging

Update docker/dtr image reference

77031cb

Merge pull request #345 from joaofnfernandes/dtr-reference

ee30fb9

Update docker/dtr image reference

incorporated Misty's rewrite from pr#256 with additional info

796ec3d

Signed-off-by: Victoria Bialas <[email protected]>

Merge pull request #340 from KevinTangy/patch-1

c041f74

Update 3_prepare_the_app.md with missing dots

Merge pull request #346 from londoncalling/clarify-hyperv-virtualbox-…

6131cd6

…in-machine-docs incorporated Misty's rewrite from pr#256 with additional info

added beta 29 release notes for mac and win

943940c

Signed-off-by: Victoria Bialas <[email protected]>

Merge pull request #347 from londoncalling/d4mac-d4win-beta29

c79c339

added beta 29 release notes for mac and win

Updated uninstall.md

fe361fb

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)

Use the correct service name when linking

13e819b

Merge pull request #307 from mstanleyjones/d4w_firewall_detection

cdbebff

Add doc for firewall auto-detection

update tag mapping label, some typo fixes

d54bb2e

Signed-off-by: LRubin <[email protected]>

update autotest descriptions

25fd57e

Signed-off-by: LRubin <[email protected]>

finishing touches on Wordpress example in Compose docs per pr#129

568cded

Signed-off-by: Victoria Bialas <[email protected]>

Merge pull request #352 from sanscontext/autotest

43e4f5a

update autotest descriptions

Merge pull request #359 from londoncalling/compose-wp-sample

962cc88

finishing touches on Wordpress example in Compose docs per pr#129

Merge pull request #354 from sanscontext/tag-mapping

eb84a42

Docker Cloud: update tag mapping label, some typo fixes

updates for multiple email address management

50d5903

Signed-off-by: LRubin <[email protected]>

Revert "Doc change to support custom userdata option for docker-machi…

08d3541

…ne AWS driver"

Merge pull request #361 from sanscontext/cloud-3400-multemails

b4d5685

Docker Cloud: updates for multiple email address management

Merge pull request #362 from docker/revert-37-aws-userdata

277e83c

Revert "Doc change to support custom userdata option for docker-machine AWS driver"

Fixing note formatting

9c53192

Changing note format back to the way it was to match the rest of the notes in this section.

Update index.md

7b04a91

Create subdirectory-based docs archive

9e96e48

Merge branch 'master' of https://github.com/docker/docker.github.io

0dd1cf2

Update index.md

eec5357

Update index.md

12389d3

added a filename above the custom script

870abe5

Added a filename above the custom script to distinguish it from the wait-for-it.sh script.

add L62-L77

05e7b79

Signed-off-by: Thomas Sjögren <[email protected]>

Add missing whitespace

110d94b

Joao Fernandes and others added 17 commits November 1, 2016 17:18

Fix typo in release notes

d20b4e7

(cherry picked from commit 46cdf5a8b80791f6d1cb6462dd66e23266a06d33)

More updates to release notes

63908b8

(cherry picked from commit adaa077d3cecdfd71bcb640cef942086e4a42d9a)

Move docs to ucp/

e53bc30

Merge pull request #418 from aduermael/absolute-links

27d00ce

absolute links to docs.docker.com are now relative links

Fix for hash links issue #413

47de0e2

Merge branch '1.1-docs' of ../orca/ into ucp-1.1

0ba114c

Fix regex capture groups syntax

1f826f9

fix: Add line breaks before and after code blocks

ba9ea84

clarify how to use Windows containers and Windows Server 2016

c92d0f3

Signed-off-by: Victoria Bialas <[email protected]>

Merge pull request #420 from londoncalling/d4win-server-2016

0855374

clarify how to use Windows containers and Windows Server 2016

Merge pull request #421 from aureliojargas/patch-1

f4ba4c6

Fix regex capture groups syntax

Merge pull request #422 from gokaygurcan/patch-1

7fc3bac

fix: Add line breaks before and after code blocks

Merge pull request #411 from joaofnfernandes/dtr-2.0

4965b11

Migrates DTR 2.0 docs with history

Merge pull request #403 from sanscontext/cloud-3129-hubcancel

936e228

CLOUD-3129 Docker Hub: update hub docs to include cancel button

Remove merge conflict metadata from UCP docs

f110279

Merge pull request #419 from joaofnfernandes/ucp-1.1

a42c61a

Migrates UCP 1.1 docs with history

Merging master into vnext-opensource

0847155

thaJeztah reviewed Nov 2, 2016

View reviewed changes

mdlinville mentioned this pull request Nov 2, 2016

Fixed URLs in examples #434

Merged

thaJeztah approved these changes Nov 2, 2016

View reviewed changes

mdlinville merged commit fe25dda into docker:vnext-opensource Nov 2, 2016

mdlinville deleted the vnext-opensource branch November 2, 2016 22:22

joaofnfernandes added a commit to joaofnfernandes/docker.github.io that referenced this pull request Apr 16, 2018

Add DTR 2.5 release notes (docker#430)

0d356b1

* Add DTR 2.5 release notes * Add redirect

JimGalasyn pushed a commit that referenced this pull request Apr 16, 2018

Add DTR 2.5 release notes (#430)

15576a0

* Add DTR 2.5 release notes * Add redirect

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge master into vnext-opensource #430

Merge master into vnext-opensource #430

Uh oh!

mdlinville commented Nov 2, 2016

Uh oh!

thaJeztah Nov 2, 2016

Uh oh!

mdlinville Nov 2, 2016

Uh oh!

thaJeztah Nov 2, 2016

Uh oh!

mdlinville Nov 2, 2016

Uh oh!

thaJeztah Nov 2, 2016

Uh oh!

mdlinville Nov 2, 2016

Uh oh!

thaJeztah Nov 2, 2016

Uh oh!

mdlinville Nov 2, 2016

Uh oh!

thaJeztah Nov 2, 2016

Uh oh!

mdlinville Nov 2, 2016

Uh oh!

mdlinville Nov 2, 2016

Uh oh!

thaJeztah left a comment

Uh oh!

thaJeztah left a comment

Uh oh!

Uh oh!

		@@ -1,254 +0,0 @@
		# Generate AUTHORS: hack/generate-authors.sh


		Instead of specifying a context, you can pass a single Dockerfile in the `URL`
		or pipe the file in via `STDIN`. To pipe a Dockerfile from `STDIN`:

Merge master into vnext-opensource #430

Merge master into vnext-opensource #430

Uh oh!

Conversation

mdlinville commented Nov 2, 2016

Describe the proposed changes

Project version

Related issue

Related issue or PR in another project

Please take a look

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!