You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/01/11 02:05:19 UTC

[shardingsphere] branch master updated: Migrate openjdk to eclipse-temurin (#23487)

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

duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new d6c42214da3 Migrate openjdk to eclipse-temurin (#23487)
d6c42214da3 is described below

commit d6c42214da3af888af040e4b758795e0c4c7cd11
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Wed Jan 11 10:05:10 2023 +0800

    Migrate openjdk to eclipse-temurin (#23487)
---
 distribution/proxy/Dockerfile                   | 2 +-
 test/e2e/agent/plugins/jaeger/Dockerfile        | 2 +-
 test/e2e/agent/plugins/metrics/Dockerfile       | 2 +-
 test/e2e/agent/plugins/opentelemetry/Dockerfile | 2 +-
 test/e2e/agent/plugins/zipkin/Dockerfile        | 2 +-
 test/e2e/fixture/Dockerfile                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/distribution/proxy/Dockerfile b/distribution/proxy/Dockerfile
index 9d512f865da..d0e05534f99 100644
--- a/distribution/proxy/Dockerfile
+++ b/distribution/proxy/Dockerfile
@@ -22,7 +22,7 @@ ENV LOCAL_PATH /opt/shardingsphere-proxy
 ADD target/${APP_NAME}.tar.gz /opt
 RUN mv /opt/${APP_NAME} ${LOCAL_PATH} && mkdir -p ${LOCAL_PATH}/ext-lib
 
-FROM openjdk:17-jdk-slim
+FROM eclipse-temurin:17-jdk
 MAINTAINER ShardingSphere "dev@shardingsphere.apache.org"
 
 ENV LOCAL_PATH /opt/shardingsphere-proxy
diff --git a/test/e2e/agent/plugins/jaeger/Dockerfile b/test/e2e/agent/plugins/jaeger/Dockerfile
index 65c1f15fca1..dee5b720558 100644
--- a/test/e2e/agent/plugins/jaeger/Dockerfile
+++ b/test/e2e/agent/plugins/jaeger/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-FROM openjdk:8-jdk-alpine
+FROM eclipse-temurin:8-jdk-alpine
 
 ARG APP_NAME
 ENV WAIT_VERSION 2.7.2
diff --git a/test/e2e/agent/plugins/metrics/Dockerfile b/test/e2e/agent/plugins/metrics/Dockerfile
index 4257d9e27af..072076fa8ab 100644
--- a/test/e2e/agent/plugins/metrics/Dockerfile
+++ b/test/e2e/agent/plugins/metrics/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-FROM openjdk:8-jdk-alpine
+FROM eclipse-temurin:8-jdk-alpine
 
 ARG APP_NAME
 ENV WAIT_VERSION 2.7.2
diff --git a/test/e2e/agent/plugins/opentelemetry/Dockerfile b/test/e2e/agent/plugins/opentelemetry/Dockerfile
index 09cbc022e11..7b49b003f8f 100644
--- a/test/e2e/agent/plugins/opentelemetry/Dockerfile
+++ b/test/e2e/agent/plugins/opentelemetry/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-FROM openjdk:8-jdk-alpine
+FROM eclipse-temurin:8-jdk-alpine
 
 ARG APP_NAME
 ENV WAIT_VERSION 2.7.2
diff --git a/test/e2e/agent/plugins/zipkin/Dockerfile b/test/e2e/agent/plugins/zipkin/Dockerfile
index 1fd2a772ece..c84c42f64ba 100644
--- a/test/e2e/agent/plugins/zipkin/Dockerfile
+++ b/test/e2e/agent/plugins/zipkin/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-FROM openjdk:8-jdk-alpine
+FROM eclipse-temurin:8-jdk-alpine
 
 ARG APP_NAME
 ENV WAIT_VERSION 2.7.2
diff --git a/test/e2e/fixture/Dockerfile b/test/e2e/fixture/Dockerfile
index 9988df045b0..1e8100212b4 100644
--- a/test/e2e/fixture/Dockerfile
+++ b/test/e2e/fixture/Dockerfile
@@ -27,7 +27,7 @@ RUN cat bin/start.sh | tr -d '\r' > _start.sh && mv _start.sh bin/start.sh
 RUN cat bin/stop.sh | tr -d '\r' > _stop.sh && mv _stop.sh bin/stop.sh
 RUN chmod +x -R ./bin
 
-FROM openjdk:8-jdk-alpine
+FROM eclipse-temurin:8-jdk-alpine
 
 COPY --from=prepare /opt/shardingsphere-proxy /opt/shardingsphere-proxy