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.

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

docker: updates Elasticsearch 7.x image to Elastic licensed 7.17.16 #3654

Merged
merged 6 commits into from
Dec 15, 2023

Conversation

codefromthecrypt
Copy link
Member

Before, we rev-locked our Elasticsearch 7.x image to the last OSS licensed version 7.10.2. This changes to the Elastic licensed current version, 7.17.16, as that's what people would run in production.

Note: As this is a test image, not a production image, usage should not violate the Elastic Basic license developers typically use, and is the default.

cc @openzipkin/elasticsearch and @xeraa

Before, we rev-locked our Elasticsearch 7.x image to the last OSS
licensed version 7.10.2. This changes to the Elastic licensed current
version, 7.17.16, as that's what people would run in production.

Note: As this is a test image, not a production image, usage should not
violate the Elastic Basic license developers typically use, and is the
default.

Signed-off-by: Adrian Cole <[email protected]>
Adrian Cole added 3 commits December 15, 2023 15:18
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
Copy link
Member Author

@codefromthecrypt codefromthecrypt left a comment

Choose a reason for hiding this comment

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

notes


FROM ghcr.io/openzipkin/java:${java_version} as install

WORKDIR /install

# Use latest 7.x version from https://www.elastic.co/downloads/past-releases#elasticsearch
# Use latest 7.x version from https://www.elastic.co/downloads/past-releases#elasticsearch-no-jdk
Copy link
Member Author

Choose a reason for hiding this comment

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

@xeraa why is there no 8.x here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member

@xeraa xeraa Dec 19, 2023

Choose a reason for hiding this comment

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

Yeah, we don't build those any more for 8. It's recommended to stick to the default JDK we provide, but you can delete the shipped JDK folder (optional) and link to any JDK you like (with or without deleting the default JDK)

LABEL org.opencontainers.image.description="Elasticsearch OSS distribution on OpenJDK and Alpine Linux"
ARG elasticsearch7_version=7.10.2
# Use a full Java distribution rather than adding test modules to the
# production -jre base layer used by zipkin and zipkin-slim.
Copy link
Member Author

Choose a reason for hiding this comment

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

docker/test-images/zipkin-elasticsearch7/Dockerfile Outdated Show resolved Hide resolved
Adrian Cole added 2 commits December 15, 2023 15:21
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
@codefromthecrypt codefromthecrypt merged commit e21beed into master Dec 15, 2023
11 checks passed
@codefromthecrypt codefromthecrypt deleted the es7-no-oss branch December 15, 2023 08:50
@codefromthecrypt
Copy link
Member Author

Thanks for the watchful eye @anuraaga!

@xeraa
Copy link
Member

xeraa commented Dec 19, 2023

Looks good. This would be even fine for production (since you don't provide it as a service, don't hack the license, or remove any trademarks)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants