diff --git a/docker/test-images/zipkin-elasticsearch7/Dockerfile b/docker/test-images/zipkin-elasticsearch7/Dockerfile index 0cebe680b1b..d7b24eb9b4a 100644 --- a/docker/test-images/zipkin-elasticsearch7/Dockerfile +++ b/docker/test-images/zipkin-elasticsearch7/Dockerfile @@ -35,11 +35,14 @@ WORKDIR /install # Use latest 7.x version from https://www.elastic.co/downloads/past-releases#elasticsearch # This is defined in many places because Docker has no "env" script functionality unless you use # docker-compose: When updating, update everywhere. -ARG elasticsearch7_version=7.17.15 +# +# TODO: 7.10.2 is the last OSS no-jdk version. To update requires a switch to non OSS. +# See https://www.elastic.co/downloads/past-releases#elasticsearch-oss-no-jdk +ARG elasticsearch7_version=7.10.2 # Download only the OSS distribution (lacks X-Pack) RUN \ -# Connection resets are frequent in GitHub Actions workflows +# Connection resets are frequent in GitHub Actions workflows \ wget --random-wait --tries=5 -qO- \ # We don't download bin scripts as we customize for reasons including BusyBox problems https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-${elasticsearch7_version}-no-jdk-linux-x86_64.tar.gz| tar xz \ @@ -49,7 +52,7 @@ COPY --from=scratch /config/ ./config/ FROM ghcr.io/openzipkin/java:${java_version}-jre as zipkin-elasticsearch7 LABEL org.opencontainers.image.description="Elasticsearch OSS distribution on OpenJDK and Alpine Linux" -ARG elasticsearch7_version=7.17.15 +ARG elasticsearch7_version=7.10.2 LABEL elasticsearch-version=$elasticsearch7_version # Add HEALTHCHECK and ENTRYPOINT scripts into the default search path