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 fa0dd8cc311389da1f129fc79a6b49ee5e693cb9 Author: kezhenxu94 <[email protected]> AuthorDate: Tue Jan 25 13:37:52 2022 +0800 Add Docker images based on 17 and test it --- .github/workflows/e2e.jdk-versions.yaml | 6 +++--- .github/workflows/publish-docker.yaml | 5 +++++ CHANGES.md | 1 + docker/oap/Dockerfile | 2 +- docker/ui/Dockerfile | 2 +- pom.xml | 2 +- test/e2e-v2/cases/meter/docker-compose.yml | 2 +- test/e2e-v2/cases/ttl/es/docker-compose.yml | 2 +- test/e2e-v2/cases/ttl/influxdb/docker-compose.yml | 2 +- test/e2e-v2/cases/ttl/iotdb/docker-compose.yml | 2 +- test/e2e-v2/cases/ttl/postgresql/docker-compose.yml | 2 +- test/e2e-v2/cases/ttl/tidb/docker-compose.yml | 2 +- test/e2e-v2/java-test-service/pom.xml | 2 +- test/e2e-v2/script/dockerfile/Dockerfile.h2 | 4 ++-- 14 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml index 5bf6ea5..49acc2e 100644 --- a/.github/workflows/e2e.jdk-versions.yaml +++ b/.github/workflows/e2e.jdk-versions.yaml @@ -33,10 +33,10 @@ jobs: timeout-minutes: 90 strategy: matrix: - jdk: [ 8, 11, 12, 13, 14, 15, 16 ] + jdk: [ 8, 11, 17 ] env: SW_AGENT_JDK_VERSION: ${{ matrix.jdk }} - SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:jre + SW_OAP_BASE_IMAGE: eclipse-temurin:${{ matrix.jdk }}-jre steps: - uses: actions/checkout@v2 with: @@ -44,7 +44,7 @@ jobs: - name: Set Up Java uses: actions/setup-java@v2 with: - distribution: adopt + distribution: temurin java-version: ${{ matrix.jdk }} - name: Run E2E Test uses: ./.github/actions/infra-e2e-test diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 559c6f4..87ca313 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -56,5 +56,10 @@ jobs: uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 + - 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 - name: Build and push docker images run: make build.all docker.push diff --git a/CHANGES.md b/CHANGES.md index 9046d0f..e065fe7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ Release Notes. the `LOG4J_FORMAT_MSG_NO_LOOKUPS=”true”` environment variable also avoids CVEs. * Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for performance improvements and ARM more native support. * Exclude unnecessary libs when building under JDK 9+. +* Migrate base Docker image to eclipse-temurin as adoptopenjdk is deprecated. #### OAP Server diff --git a/docker/oap/Dockerfile b/docker/oap/Dockerfile index c6742ca..9f9a581 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='adoptopenjdk/openjdk11:jre' +ARG BASE_IMAGE='eclipse-temurin:11-jre' ARG SKYWALKING_CLI_VERSION diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile index 904e593..a7cbbca 100644 --- a/docker/ui/Dockerfile +++ b/docker/ui/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM adoptopenjdk/openjdk11:jre +FROM eclipse-temurin:11-jre ENV JAVA_OPTS=" -Xms256M " \ SW_OAP_ADDRESS="http://127.0.0.1:12800"; diff --git a/pom.xml b/pom.xml index 94f0abb..98df954 100755 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ <checkstyle.version>6.18</checkstyle.version> <junit.version>4.12</junit.version> <mockito-core.version>3.5.13</mockito-core.version> - <lombok.version>1.18.20</lombok.version> + <lombok.version>1.18.22</lombok.version> <!-- core lib dependency --> <grpc.version>1.43.2</grpc.version> diff --git a/test/e2e-v2/cases/meter/docker-compose.yml b/test/e2e-v2/cases/meter/docker-compose.yml index 7590a7d..7bb194b 100644 --- a/test/e2e-v2/cases/meter/docker-compose.yml +++ b/test/e2e-v2/cases/meter/docker-compose.yml @@ -40,7 +40,7 @@ services: - 9090 sender: - image: "adoptopenjdk/openjdk8:alpine-jre" + image: "eclipse-temurin:8-jre" volumes: - ./../../java-test-service/e2e-mock-sender/target/e2e-mock-sender-2.0.0.jar:/e2e-mock-sender-2.0.0.jar command: [ "java", "-jar", "/e2e-mock-sender-2.0.0.jar" ] diff --git a/test/e2e-v2/cases/ttl/es/docker-compose.yml b/test/e2e-v2/cases/ttl/es/docker-compose.yml index 25841f5..426a4b1 100644 --- a/test/e2e-v2/cases/ttl/es/docker-compose.yml +++ b/test/e2e-v2/cases/ttl/es/docker-compose.yml @@ -48,7 +48,7 @@ services: - 12800 sender: - image: "adoptopenjdk/openjdk8:alpine-jre" + image: "eclipse-temurin:8-jre" volumes: - ./../../../java-test-service/e2e-mock-sender/target/e2e-mock-sender-2.0.0.jar:/e2e-mock-sender-2.0.0.jar command: [ "java", "-jar", "/e2e-mock-sender-2.0.0.jar" ] diff --git a/test/e2e-v2/cases/ttl/influxdb/docker-compose.yml b/test/e2e-v2/cases/ttl/influxdb/docker-compose.yml index 4d7e906..f83fa12 100644 --- a/test/e2e-v2/cases/ttl/influxdb/docker-compose.yml +++ b/test/e2e-v2/cases/ttl/influxdb/docker-compose.yml @@ -43,7 +43,7 @@ services: - 12800 sender: - image: "adoptopenjdk/openjdk8:alpine-jre" + image: "eclipse-temurin:8-jre" volumes: - ./../../../java-test-service/e2e-mock-sender/target/e2e-mock-sender-2.0.0.jar:/e2e-mock-sender-2.0.0.jar command: [ "java", "-jar", "/e2e-mock-sender-2.0.0.jar" ] diff --git a/test/e2e-v2/cases/ttl/iotdb/docker-compose.yml b/test/e2e-v2/cases/ttl/iotdb/docker-compose.yml index 2a5c238..131c72f 100644 --- a/test/e2e-v2/cases/ttl/iotdb/docker-compose.yml +++ b/test/e2e-v2/cases/ttl/iotdb/docker-compose.yml @@ -43,7 +43,7 @@ services: - 12800 sender: - image: "adoptopenjdk/openjdk8:alpine-jre" + image: "eclipse-temurin:8-jre" volumes: - ./../../../java-test-service/e2e-mock-sender/target/e2e-mock-sender-2.0.0.jar:/e2e-mock-sender-2.0.0.jar command: [ "java", "-jar", "/e2e-mock-sender-2.0.0.jar" ] diff --git a/test/e2e-v2/cases/ttl/postgresql/docker-compose.yml b/test/e2e-v2/cases/ttl/postgresql/docker-compose.yml index 3b16806..dad2729 100644 --- a/test/e2e-v2/cases/ttl/postgresql/docker-compose.yml +++ b/test/e2e-v2/cases/ttl/postgresql/docker-compose.yml @@ -47,7 +47,7 @@ services: - 12800 sender: - image: "adoptopenjdk/openjdk8:alpine-jre" + image: "eclipse-temurin:8-jre" volumes: - ./../../../java-test-service/e2e-mock-sender/target/e2e-mock-sender-2.0.0.jar:/e2e-mock-sender-2.0.0.jar command: [ "java", "-jar", "/e2e-mock-sender-2.0.0.jar" ] diff --git a/test/e2e-v2/cases/ttl/tidb/docker-compose.yml b/test/e2e-v2/cases/ttl/tidb/docker-compose.yml index 344cd02..3b5654e 100644 --- a/test/e2e-v2/cases/ttl/tidb/docker-compose.yml +++ b/test/e2e-v2/cases/ttl/tidb/docker-compose.yml @@ -49,7 +49,7 @@ services: - 12800 sender: - image: "adoptopenjdk/openjdk8:alpine-jre" + image: "eclipse-temurin:8-jre" volumes: - ./../../../java-test-service/e2e-mock-sender/target/e2e-mock-sender-2.0.0.jar:/e2e-mock-sender-2.0.0.jar command: [ "java", "-jar", "/e2e-mock-sender-2.0.0.jar" ] diff --git a/test/e2e-v2/java-test-service/pom.xml b/test/e2e-v2/java-test-service/pom.xml index 9cb9819..858b30f 100644 --- a/test/e2e-v2/java-test-service/pom.xml +++ b/test/e2e-v2/java-test-service/pom.xml @@ -50,7 +50,7 @@ <guava.version>30.1.1-jre</guava.version> <h2.version>2.1.210</h2.version> <mysql.version>8.0.13</mysql.version> - <lombok.version>1.18.20</lombok.version> + <lombok.version>1.18.22</lombok.version> <kafka-clients.version>2.4.1</kafka-clients.version> <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version> diff --git a/test/e2e-v2/script/dockerfile/Dockerfile.h2 b/test/e2e-v2/script/dockerfile/Dockerfile.h2 index b77f407..7efd795 100644 --- a/test/e2e-v2/script/dockerfile/Dockerfile.h2 +++ b/test/e2e-v2/script/dockerfile/Dockerfile.h2 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM adoptopenjdk/openjdk8:alpine +FROM eclipse-temurin:11-jre WORKDIR /h2 @@ -21,4 +21,4 @@ VOLUME /h2/data ADD https://repo.maven.apache.org/maven2/com/h2database/h2/1.4.200/h2-1.4.200.jar /h2 -CMD ["sh", "-c", "java -cp /h2/*.jar org.h2.tools.Server -tcp -tcpAllowOthers -tcpPort 1521 -ifNotExists -baseDir /h2/data"] \ No newline at end of file +CMD ["sh", "-c", "java -cp /h2/*.jar org.h2.tools.Server -tcp -tcpAllowOthers -tcpPort 1521 -ifNotExists -baseDir /h2/data"]
