This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch virtual-threads in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit af303c72eb2c11e68c6ca0b377fcd57781cc099d Author: Wu Sheng <[email protected]> AuthorDate: Mon Feb 16 16:38:03 2026 +0800 Change default Docker base image to JDK 25 for virtual thread support JDK 25 is now the default Docker image (eclipse-temurin:25-jre). JDK 11 is kept as a -java11 variant, alongside existing -java17 and -java21. Co-Authored-By: Claude Opus 4.6 <[email protected]> --- .github/workflows/publish-docker.yaml | 10 +++++----- docker/oap/Dockerfile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index de78893219..3e2a3c757d 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -75,6 +75,11 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Build and push docker images based on Java 11 + env: + SW_OAP_BASE_IMAGE: eclipse-temurin:11-jre + TAG: ${{ env.TAG }}-java11 + run: make build.all docker.push - name: Build and push docker images based on Java 17 env: SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre @@ -85,11 +90,6 @@ jobs: SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre TAG: ${{ env.TAG }}-java21 run: make build.all docker.push - - name: Build and push docker images based on Java 25 - env: - SW_OAP_BASE_IMAGE: eclipse-temurin:25-jre - TAG: ${{ env.TAG }}-java25 - run: make build.all docker.push - name: Build and push docker images run: make build.all docker.push - name: Build and push data-generator image diff --git a/docker/oap/Dockerfile b/docker/oap/Dockerfile index b4072c746d..5e346b8023 100644 --- a/docker/oap/Dockerfile +++ b/docker/oap/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG BASE_IMAGE='eclipse-temurin:11-jre' +ARG BASE_IMAGE='eclipse-temurin:25-jre' FROM $BASE_IMAGE
