You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2022/01/25 05:38:20 UTC

[skywalking] branch docker/j17 created (now 1e129ac)

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch docker/j17
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


      at 1e129ac  Add Docker images based on 17 and test it

This branch includes the following new commits:

     new 1e129ac  Add Docker images based on 17 and test it

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


[skywalking] 01/01: Add Docker images based on 17 and test it

Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch docker/j17
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 1e129ac177ecb08fa220c40e26e0c6ef15345c49
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Jan 25 13:37:52 2022 +0800

    Add Docker images based on 17 and test it
---
 .github/workflows/e2e.jdk-versions.yaml | 15 ++++++++++++---
 .github/workflows/publish-docker.yaml   |  6 ++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml
index 5bf6ea5..77cb7a4 100644
--- a/.github/workflows/e2e.jdk-versions.yaml
+++ b/.github/workflows/e2e.jdk-versions.yaml
@@ -17,6 +17,9 @@
 name: E2E
 
 on:
+  push:
+    branches:
+      - docker/j17
   pull_request:
   schedule:
     - cron: '0 18 * * *'
@@ -25,6 +28,9 @@ concurrency:
   group: e2e-jdk-versions-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
+env:
+  SW_AGENT_JDK_VERSION: 8
+
 jobs:
   JavaVersions:
     if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
@@ -33,10 +39,13 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        jdk: [ 8, 11, 12, 13, 14, 15, 16 ]
+        base-image:
+          - adoptopenjdk/openjdk8:jre
+          - adoptopenjdk/openjdk11:jre
+          - adoptopenjdk/openjdk16:jre
+          - eclipse-temurin:17-jre
     env:
-      SW_AGENT_JDK_VERSION: ${{ matrix.jdk }}
-      SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:jre
+      SW_OAP_BASE_IMAGE: ${{ matrix.base-image }}
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 559c6f4..47960d9 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -20,6 +20,7 @@ on:
   push:
     branches:
       - master
+      - docker/j17
 
 env:
   SKIP_TEST: true
@@ -58,3 +59,8 @@ jobs:
         uses: docker/setup-buildx-action@v1
       - name: Build and push docker images
         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
+          TAG: ${{ github.sha }}-java17
+        run: make build.all docker.push