Skip to content

Commit 19a8e3e

Browse files
committed
Update Docker images (and a few dependency updates)
Signed-off-by: Andriy Redko <[email protected]>
1 parent ee0eb37 commit 19a8e3e

File tree

13 files changed

+17
-17
lines changed

13 files changed

+17
-17
lines changed

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
99
# This is defined in many places because Docker has no "env" script functionality unless you use
1010
# docker-compose: When updating, update everywhere.
11-
ARG java_version=21.0.6_p7
11+
ARG java_version=21.0.7_p6
1212

1313
# We copy files from the context into a scratch container first to avoid a problem where docker and
1414
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-activemq/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
99
# This is defined in many places because Docker has no "env" script functionality unless you use
1010
# docker-compose: When updating, update everywhere.
11-
ARG java_version=21.0.6_p7
11+
ARG java_version=21.0.7_p6
1212

1313
# We copy files from the context into a scratch container first to avoid a problem where docker and
1414
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-cassandra/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
99
# This is defined in many places because Docker has no "env" script functionality unless you use
1010
# docker-compose: When updating, update everywhere.
11-
ARG java_version=21.0.6_p7
11+
ARG java_version=21.0.7_p6
1212

1313
# We copy files from the context into a scratch container first to avoid a problem where docker and
1414
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-elasticsearch7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
99
# This is defined in many places because Docker has no "env" script functionality unless you use
1010
# docker-compose: When updating, update everywhere.
11-
ARG java_version=21.0.6_p7
11+
ARG java_version=21.0.7_p6
1212

1313
# We copy files from the context into a scratch container first to avoid a problem where docker and
1414
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-elasticsearch8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
99
# This is defined in many places because Docker has no "env" script functionality unless you use
1010
# docker-compose: When updating, update everywhere.
11-
ARG java_version=21.0.6_p7
11+
ARG java_version=21.0.7_p6
1212

1313
# We copy files from the context into a scratch container first to avoid a problem where docker and
1414
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-eureka/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Use latest version here: https://github.com/orgs/openeureka/packages/container/package/java
99
# This is defined in many places because Docker has no "env" script functionality unless you use
1010
# docker-compose: When updating, update everywhere.
11-
ARG java_version=21.0.6_p7
11+
ARG java_version=21.0.7_p6
1212

1313
# We copy files from the context into a scratch container first to avoid a problem where docker and
1414
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-eureka/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-dependencies</artifactId>
32-
<version>3.4.4</version>
32+
<version>3.4.5</version>
3333
<type>pom</type>
3434
<scope>import</scope>
3535
</dependency>

docker/test-images/zipkin-kafka/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
99
# This is defined in many places because Docker has no "env" script functionality unless you use
1010
# docker-compose: When updating, update everywhere.
11-
ARG java_version=21.0.6_p7
11+
ARG java_version=21.0.7_p6
1212

1313
# We copy files from the context into a scratch container first to avoid a problem where docker and
1414
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-mysql/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/alpine
77
# This is defined in many places because Docker has no "env" script functionality unless you use
88
# docker-compose: When updating, update everywhere.
9-
ARG alpine_version=3.21.2
9+
ARG alpine_version=3.21.3
1010

1111
# We copy files from the context into a scratch container first to avoid a problem where docker and
1212
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-opensearch2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
99
# This is defined in many places because Docker has no "env" script functionality unless you use
1010
# docker-compose: When updating, update everywhere.
11-
ARG java_version=21.0.6_p7
11+
ARG java_version=21.0.7_p6
1212

1313
# We copy files from the context into a scratch container first to avoid a problem where docker and
1414
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-ui/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/alpine
77
# This is defined in many places because Docker has no "env" script functionality unless you use
88
# docker-compose: When updating, update everywhere.
9-
ARG alpine_version=3.21.2
9+
ARG alpine_version=3.21.3
1010

1111
# java_version is used during the installation process to build or download the zipkin-lens jar.
1212
#
1313
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
1414
# This is defined in many places because Docker has no "env" script functionality unless you use
1515
# docker-compose: When updating, update everywhere.
16-
ARG java_version=21.0.6_p7
16+
ARG java_version=21.0.7_p6
1717

1818
# We copy files from the context into a scratch container first to avoid a problem where docker and
1919
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

docker/test-images/zipkin-uiproxy/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/alpine
77
# This is defined in many places because Docker has no "env" script functionality unless you use
88
# docker-compose: When updating, update everywhere.
9-
ARG alpine_version=3.21.2
9+
ARG alpine_version=3.21.3
1010

1111
# java_version is used during the installation process to build or download the zipkin-lens jar.
1212
#
1313
# Use latest version here: https://github.com/orgs/openzipkin/packages/container/package/java
1414
# This is defined in many places because Docker has no "env" script functionality unless you use
1515
# docker-compose: When updating, update everywhere.
16-
ARG java_version=21.0.6_p7
16+
ARG java_version=21.0.7_p6
1717

1818
# We copy files from the context into a scratch container first to avoid a problem where docker and
1919
# docker compose don't share layer hashes https://github.com/docker/compose/issues/883 normally.

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<armeria.groupId>com.linecorp.armeria</armeria.groupId>
5050
<armeria.version>1.32.3</armeria.version>
5151
<!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
52-
<netty.version>4.1.120.Final</netty.version>
52+
<netty.version>4.1.121.Final</netty.version>
5353

5454
<!-- It's easy for Jackson dependencies to get misaligned, so we manage it ourselves. -->
5555
<jackson.version>2.18.3</jackson.version>
@@ -61,7 +61,7 @@
6161
<javax-annotation-api.version>1.3.2</javax-annotation-api.version>
6262

6363
<!-- update together -->
64-
<spring-boot.version>3.4.4</spring-boot.version>
64+
<spring-boot.version>3.4.5</spring-boot.version>
6565
<spring.version>6.2.6</spring.version>
6666

6767
<!-- MySQL connector is GPL, even if it has an OSS exception.
@@ -85,7 +85,7 @@
8585
<kryo.version>5.6.2</kryo.version>
8686
<!-- Only used for proto interop testing; wire-maven-plugin is usually behind latest. -->
8787
<wire.version>5.1.0</wire.version>
88-
<gson.version>2.13.0</gson.version>
88+
<gson.version>2.13.1</gson.version>
8989
<unpack-proto.directory>${project.build.directory}/test/proto</unpack-proto.directory>
9090

9191
<license.skip>${skipTests}</license.skip>

0 commit comments

Comments
 (0)