Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DOCS] Removes alternative docker pull example #31934

Merged
merged 4 commits into from
Jul 11, 2018
Merged

[DOCS] Removes alternative docker pull example #31934

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8cb070
[DOCS] Removes alternative docker pull example
lcawl Jul 10, 2018
5874c5d
[DOCS] Moves info about oss images
lcawl Jul 10, 2018
faf4adc
[DOCS] Merging two sentences about oss images
lcawl Jul 10, 2018
1dbc5e5
[DOCS] Changed images to singular
lcawl Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions docs/reference/setup/install/docker.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,13 @@ A list of all published Docker images and tags can be found in
https://www.docker.elastic.co[www.docker.elastic.co]. The source code can be found
on https://github.com/elastic/elasticsearch-docker/tree/{branch}[GitHub].

==== Image types

These images are free to use under the Elastic license. They contain open source
and free commercial features and access to paid commercial features.
{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the
paid commercial features. See the
https://www.elastic.co/subscriptions[Subscriptions] page for information about
Elastic license levels.

Alternatively, you can download `-oss` images, which contain only features that
are available under the Apache 2.0 license.

==== Pulling the image

Obtaining {es} for Docker is as simple as issuing a +docker pull+ command
Expand All @@ -34,14 +29,17 @@ endif::[]

ifeval::["{release-state}"!="unreleased"]

Docker images can be retrieved with the following commands:
For example, Docker images can be retrieved with the following command:
Copy link
Contributor

Choose a reason for hiding this comment

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

Would this become "the Docker image" (singular)?


["source","sh",subs="attributes"]
--------------------------------------------
docker pull {docker-repo}:{version}
docker pull {docker-repo}-oss:{version}
--------------------------------------------

Alternatively, you can download other Docker images that contain only features
that are available under the Apache 2.0 license from
https://www.docker.elastic.co[www.docker.elastic.co].

endif::[]

[[docker-cli-run]]
Expand Down