From 5fe74a87ab14052cbc32facdc07464bd06c067bd Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Fri, 24 Jan 2020 19:33:19 +0800 Subject: [PATCH] Updates docker images to latest (#2967) --- docker/Dockerfile | 6 +++--- docker/Dockerfile.release | 4 ++-- docker/collector/kafka/Dockerfile | 8 ++++---- docker/collector/kafka/install.sh | 4 ++-- docker/storage/cassandra/Dockerfile | 4 ++-- docker/storage/elasticsearch6/Dockerfile | 6 +++--- docker/storage/elasticsearch7/Dockerfile | 6 +++--- pom.xml | 2 +- zipkin-collector/kafka/pom.xml | 4 ++-- .../zipkin2/storage/cassandra/v1/ITCassandraStorage.java | 2 +- .../zipkin2/storage/cassandra/ITCassandraStorage.java | 2 +- .../integration/ITElasticsearchStorageV6.java | 2 +- .../integration/ITElasticsearchStorageV7.java | 2 +- .../java/zipkin2/storage/mysql/v1/ITMySQLStorage.java | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b939c93e550..2f379961488 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2019 The OpenZipkin Authors +# Copyright 2015-2020 The OpenZipkin Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -63,7 +63,7 @@ CMD ["/usr/local/bin/nginx.sh"] # zipkin-slim - An image containing the slim distribution of Zipkin server. ##### -FROM openzipkin/jre-full:11.0.4-11.33 as zipkin-slim +FROM openzipkin/jre-full:11.0.5-11.35 as zipkin-slim LABEL MAINTAINER Zipkin "https://zipkin.io/" # Use to set heap, trust store or other system properties. @@ -114,7 +114,7 @@ ENTRYPOINT ["/busybox/sh", "run.sh"] # zipkin-server - An image containing the full distribution of Zipkin server. ##### -FROM openzipkin/jre-full:11.0.4-11.33 as zipkin-server +FROM openzipkin/jre-full:11.0.5-11.35 as zipkin-server LABEL MAINTAINER Zipkin "https://zipkin.io/" # Use to set heap, trust store or other system properties. diff --git a/docker/Dockerfile.release b/docker/Dockerfile.release index 99a7cb012c2..63e8323d0df 100644 --- a/docker/Dockerfile.release +++ b/docker/Dockerfile.release @@ -66,7 +66,7 @@ CMD ["/usr/local/bin/nginx.sh"] # zipkin-slim - An image containing the slim distribution of Zipkin server. ##### -FROM openzipkin/jre-full:11.0.4-11.33 as zipkin-slim +FROM openzipkin/jre-full:11.0.5-11.35 as zipkin-slim LABEL MAINTAINER Zipkin "https://zipkin.io/" # Use to set heap, trust store or other system properties. @@ -89,7 +89,7 @@ ENTRYPOINT ["/busybox/sh", "run.sh"] # zipkin-server - An image containing the full distribution of Zipkin server. ##### -FROM openzipkin/jre-full:11.0.4-11.33 as zipkin-server +FROM openzipkin/jre-full:11.0.5-11.35 as zipkin-server LABEL MAINTAINER Zipkin "https://zipkin.io/" # Use to set heap, trust store or other system properties. diff --git a/docker/collector/kafka/Dockerfile b/docker/collector/kafka/Dockerfile index bdc7e7cf04c..e959be26817 100644 --- a/docker/collector/kafka/Dockerfile +++ b/docker/collector/kafka/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2019 The OpenZipkin Authors +# Copyright 2015-2020 The OpenZipkin Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -15,8 +15,8 @@ FROM alpine ENV SCALA_VERSION 2.12 -ENV KAFKA_VERSION 2.3.0 -ENV ZOOKEEPER_VERSION 3.4.14 +ENV KAFKA_VERSION 2.4.0 +ENV ZOOKEEPER_VERSION 3.5.6 WORKDIR /kafka ADD docker/collector/kafka/install.sh /kafka/install @@ -26,7 +26,7 @@ ADD docker/collector/kafka/wait-for-zookeeper.sh /kafka/bin ADD docker/collector/kafka/start.sh /kafka/bin # Share the same base image to reduce layers used in testing -FROM openzipkin/jre-full:11.0.4-11.33 +FROM openzipkin/jre-full:11.0.5-11.35 LABEL MAINTAINER Zipkin "https://zipkin.io/" WORKDIR /kafka diff --git a/docker/collector/kafka/install.sh b/docker/collector/kafka/install.sh index faae2ee14e7..a49e86b1a9c 100755 --- a/docker/collector/kafka/install.sh +++ b/docker/collector/kafka/install.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2015-2019 The OpenZipkin Authors +# Copyright 2015-2020 The OpenZipkin Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -20,7 +20,7 @@ apk add --update --no-cache jq curl APACHE_MIRROR=$(curl --stderr /dev/null https://www.apache.org/dyn/closer.cgi\?as_json\=1 | jq -r '.preferred') -curl -sSL $APACHE_MIRROR/zookeeper/zookeeper-$ZOOKEEPER_VERSION/zookeeper-$ZOOKEEPER_VERSION.tar.gz | tar xz +curl -sSL $APACHE_MIRROR/zookeeper/zookeeper-$ZOOKEEPER_VERSION/apache-zookeeper-$ZOOKEEPER_VERSION.tar.gz | tar xz mkdir zookeeper mv zookeeper-$ZOOKEEPER_VERSION/conf zookeeper/ diff --git a/docker/storage/cassandra/Dockerfile b/docker/storage/cassandra/Dockerfile index 8ca3c760fde..d9d69bdbd35 100644 --- a/docker/storage/cassandra/Dockerfile +++ b/docker/storage/cassandra/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2019 The OpenZipkin Authors +# Copyright 2015-2020 The OpenZipkin Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -26,7 +26,7 @@ COPY docker/storage/cassandra/install.sh /usr/local/bin/install FROM openzipkin/jre-full:1.8.0_212 MAINTAINER OpenZipkin "http://zipkin.io/" -ENV CASSANDRA_VERSION=3.11.4 \ +ENV CASSANDRA_VERSION=3.11.5 \ JAVA=/usr/local/java/jre/bin/java \ JVM_OPTS="-Dcassandra -Djava.net.preferIPv4Stack=true" diff --git a/docker/storage/elasticsearch6/Dockerfile b/docker/storage/elasticsearch6/Dockerfile index f399e782a54..7205e64a01c 100644 --- a/docker/storage/elasticsearch6/Dockerfile +++ b/docker/storage/elasticsearch6/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2019 The OpenZipkin Authors +# Copyright 2015-2020 The OpenZipkin Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -14,7 +14,7 @@ FROM alpine -ENV ELASTICSEARCH_VERSION 6.8.3 +ENV ELASTICSEARCH_VERSION 6.8.6 RUN apk add --update curl @@ -25,7 +25,7 @@ RUN curl -sSL https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch COPY docker/storage/elasticsearch6/config /elasticsearch/config -FROM openzipkin/jre-full:11.0.4-11.33 +FROM openzipkin/jre-full:11.0.5-11.35 LABEL MAINTAINER Zipkin "https://zipkin.io/" # https://github.com/elastic/elasticsearch/pull/31003 was closed won't fix diff --git a/docker/storage/elasticsearch7/Dockerfile b/docker/storage/elasticsearch7/Dockerfile index d4e4714e8a1..565d2934add 100644 --- a/docker/storage/elasticsearch7/Dockerfile +++ b/docker/storage/elasticsearch7/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright 2015-2019 The OpenZipkin Authors +# Copyright 2015-2020 The OpenZipkin Authors # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -14,7 +14,7 @@ FROM alpine -ENV ELASTICSEARCH_VERSION 7.4.0 +ENV ELASTICSEARCH_VERSION 7.5.2 RUN apk add --update curl @@ -27,7 +27,7 @@ RUN curl -sSL https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch COPY docker/storage/elasticsearch7/config /elasticsearch/config -FROM openzipkin/jre-full:11.0.4-11.33 +FROM openzipkin/jre-full:11.0.5-11.35 LABEL MAINTAINER Zipkin "https://zipkin.io/" # https://github.com/elastic/elasticsearch/pull/31003 was closed won't fix diff --git a/pom.xml b/pom.xml index 83ee204d88b..3454b2a174b 100755 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 3.14.0 4.0.2 1.3 - 1.12.4 + 1.12.5 4.3.1 1.7 diff --git a/zipkin-collector/kafka/pom.xml b/zipkin-collector/kafka/pom.xml index 0550a0453fa..fd460523d1f 100644 --- a/zipkin-collector/kafka/pom.xml +++ b/zipkin-collector/kafka/pom.xml @@ -29,7 +29,7 @@ ${project.basedir}/../.. - 2.3.0 + 2.4.0 @@ -50,7 +50,7 @@ kafka-junit - 4.1.6 + 4.1.7 test diff --git a/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java b/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java index 94a5d2d61bc..0eab0e65cb0 100644 --- a/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java +++ b/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java @@ -43,7 +43,7 @@ class ITCassandraStorage { @RegisterExtension CassandraStorageExtension backend = - new CassandraStorageExtension("openzipkin/zipkin-cassandra:2.19.2"); + new CassandraStorageExtension("openzipkin/zipkin-cassandra:2.19.3"); @Nested class ITTraces extends zipkin2.storage.ITTraces { diff --git a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java index 43300483039..e80ac30ef2f 100644 --- a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java +++ b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java @@ -45,7 +45,7 @@ class ITCassandraStorage { @RegisterExtension CassandraStorageExtension backend = new CassandraStorageExtension( - "openzipkin/zipkin-cassandra:2.19.2"); + "openzipkin/zipkin-cassandra:2.19.3"); @Nested class ITTraces extends zipkin2.storage.ITTraces { diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java index 0a37bd28012..c91d7760740 100644 --- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java +++ b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java @@ -20,7 +20,7 @@ class ITElasticsearchStorageV6 extends ITElasticsearchStorage { @RegisterExtension ElasticsearchStorageExtension backend = new ElasticsearchStorageExtension( - "openzipkin/zipkin-elasticsearch6:2.19.2"); + "openzipkin/zipkin-elasticsearch6:2.19.3"); @Override ElasticsearchStorageExtension backend() { return backend; diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java index c5d4e29d62d..e45aa52cc64 100644 --- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java +++ b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java @@ -20,7 +20,7 @@ class ITElasticsearchStorageV7 extends ITElasticsearchStorage { @RegisterExtension ElasticsearchStorageExtension backend = new ElasticsearchStorageExtension( - "openzipkin/zipkin-elasticsearch7:2.19.2"); + "openzipkin/zipkin-elasticsearch7:2.19.3"); @Override ElasticsearchStorageExtension backend() { return backend; diff --git a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java index d7d1ec2b3ec..c43c414b5b8 100644 --- a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java +++ b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java @@ -34,7 +34,7 @@ class ITMySQLStorage { @RegisterExtension MySQLStorageExtension backend = new MySQLStorageExtension( - "openzipkin/zipkin-mysql:2.19.2"); + "openzipkin/zipkin-mysql:2.19.3"); @Nested class ITTraces extends zipkin2.storage.ITTraces {