Updates docker images to latest (openzipkin#2967)

lipujie · Jan 24, 2020 · 5fe74a8 · 5fe74a8
1 parent 67f6ad4
commit 5fe74a8
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -81,7 +81,7 @@
     <assertj.version>3.14.0</assertj.version>
     <awaitility.version>4.0.2</awaitility.version>
     <hamcrest.version>1.3</hamcrest.version>
-    <testcontainers.version>1.12.4</testcontainers.version>
+    <testcontainers.version>1.12.5</testcontainers.version>
     <okhttp.version>4.3.1</okhttp.version>
 
     <auto-value.version>1.7</auto-value.version>

diff --git a/zipkin-collector/kafka/pom.xml b/zipkin-collector/kafka/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <main.basedir>${project.basedir}/../..</main.basedir>
     <!-- when changing this, a change to the version of kafka-junit is likely needed, too -->
-    <kafka.version>2.3.0</kafka.version>
+    <kafka.version>2.4.0</kafka.version>
   </properties>
 
   <dependencies>
@@ -50,7 +50,7 @@
       <artifactId>kafka-junit</artifactId>
       <!-- This version is tightly coupled to the version of kafka-clients being used.
        https://github.com/charithe/kafka-junit -->
-      <version>4.1.6</version>
+      <version>4.1.7</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/...n-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java b/...n-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<CassandraStorage> {

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
@@ -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<CassandraStorage> {

diff --git a/...asticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java b/...asticsearch/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/...asticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java b/...asticsearch/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
@@ -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<MySQLStorage> {