This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 2bd500b831 Add JDK 21 image container (#646)
2bd500b831 is described below
commit 2bd500b83120527a164f0131155e928894a2ba28
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Wed Nov 8 18:13:56 2023 +0800
Add JDK 21 image container (#646)
---
.github/workflows/publish-docker.yaml | 2 +-
CHANGES.md | 1 +
Makefile | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index 96b90d3fd4..be696af980 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -64,7 +64,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
- java-version: [ 8, 11, 17 ]
+ java-version: [ 8, 11, 17, 21 ]
env:
TAG: ${{ github.sha }}
steps:
diff --git a/CHANGES.md b/CHANGES.md
index 3129731e80..0b38c88c14 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ Release Notes.
* Add a netty-http 4.1.x plugin to trace HTTP requests.
* Fix Impala Jdbc URL (including schema without properties) parsing exception.
* Optimize byte-buddy type description performance.
+* Add `eclipse-temurin:21-jre` as another base image.
#### Documentation
diff --git a/Makefile b/Makefile
index c7e4eb8c3a..4e7e9ca834 100644
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,14 @@ dist: build
# Docker build
-base.all := alpine java8 java11 java17
+base.all := alpine java8 java11 java17 java21
base.each = $(word 1, $@)
base.image.alpine := alpine:3
base.image.java8 := eclipse-temurin:8-jre
base.image.java11 := eclipse-temurin:11-jre
base.image.java17 := eclipse-temurin:17-jre
+base.image.java21 := eclipse-temurin:21-jre
docker.%: PLATFORMS =
docker.%: LOAD_OR_PUSH = --load
