Skip to content

Docker docs v6#14683

Merged
4 commits merged intomasterfrom
unknown repository
Nov 2, 2017
Merged

Docker docs v6#14683
4 commits merged intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Oct 31, 2017

Documentation for the new Docker image flavours (x-pack, oss).

@ghost ghost requested a review from dliappis October 31, 2017 04:14
The images are shipped with https://www.elastic.co/products/x-pack[X-Pack]
installed.
A list of all published Docker images and tags can be found at
https://www.docker.elastic.co[www.docker.elastic.co]. The source code can be
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, I did not know about this!

Copy link
Copy Markdown
Member

@tylersmalley tylersmalley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tylersmalley
Copy link
Copy Markdown
Member

Let me know if you would like this backported for you - Just need to know what versions this affects.

@ghost
Copy link
Copy Markdown
Author

ghost commented Nov 1, 2017

Thanks. This is correct for all versions >= 6.

@ghost ghost merged commit ee5301f into elastic:master Nov 2, 2017
@ghost
Copy link
Copy Markdown
Author

ghost commented Nov 2, 2017

I went ahead and merged this to master. I'd like to get it into 6.x and 6.0 too.

Should I just cherry-pick it in, or do you Kibanoligists need some extra magic?

@tylersmalley
Copy link
Copy Markdown
Member

@Jarpy, cherry-pick is fine.

Usually, when it's a large change we create a PR to ensure we don't break CI, but considering this is targeting docs it's unnecessary.

@ghost
Copy link
Copy Markdown
Author

ghost commented Nov 2, 2017

Roger. Thank you.

ghost pushed a commit that referenced this pull request Nov 2, 2017
Update Docker docs for 6.0.0 and image flavours

* Use Compose v2 in Docker examples

* Use US spelling in Docker docs

* Link to www.docker.elastic.co in docs
ghost pushed a commit that referenced this pull request Nov 2, 2017
Update Docker docs for 6.0.0 and image flavours

* Use Compose v2 in Docker examples

* Use US spelling in Docker docs

* Link to www.docker.elastic.co in docs
@ghost ghost deleted the docker-docs-v6 branch November 2, 2017 04:42
@tylersmalley
Copy link
Copy Markdown
Member

6.0: 40eefea
6.x/6.1: f2cd26a

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant