From 21f4b572c53b8cc3d5139afd4e1d865e8c06d975 Mon Sep 17 00:00:00 2001 From: Dongjie Shi Date: Wed, 9 Mar 2022 09:57:52 +0800 Subject: [PATCH] upgrade ppml bigdl to 2.0.0 (#4203) * upgrade ppml bigdl to 2.0.0 * upgrade ppml bigdl to 2.0.0 --- ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile | 2 +- ppml/trusted-big-data-ml/scala/docker-occlum/Dockerfile | 2 +- ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile | 2 +- ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile | 6 +++--- scala/ppml/demo/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile b/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile index f9d8cb44faa..040ae8c07e2 100644 --- a/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile +++ b/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile @@ -1,4 +1,4 @@ -ARG BIGDL_VERSION=2.0.0-SNAPSHOT +ARG BIGDL_VERSION=2.0.0 ARG SPARK_VERSION=3.1.2 ARG TINI_VERSION=v0.18.0 ARG JDK_VERSION=8u192 diff --git a/ppml/trusted-big-data-ml/scala/docker-occlum/Dockerfile b/ppml/trusted-big-data-ml/scala/docker-occlum/Dockerfile index 327c93b2088..c0b1b4a6b4c 100644 --- a/ppml/trusted-big-data-ml/scala/docker-occlum/Dockerfile +++ b/ppml/trusted-big-data-ml/scala/docker-occlum/Dockerfile @@ -158,7 +158,7 @@ RUN cd /opt && \ FROM occlum/occlum:0.27.0-ubuntu20.04 as ppml -ARG BIGDL_VERSION=2.0.0-SNAPSHOT +ARG BIGDL_VERSION=2.0.0 ARG SPARK_VERSION=3.1.2 ARG HADOOP_VERSION=3.2.0 ENV HADOOP_VERSION=${HADOOP_VERSION} diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile b/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile index 80ebfc304e2..48421402d99 100755 --- a/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile +++ b/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile @@ -1,4 +1,4 @@ -ARG BIGDL_VERSION=2.0.0-SNAPSHOT +ARG BIGDL_VERSION=2.0.0 ARG SPARK_VERSION=3.1.2 # stage.1 graphene diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile b/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile index 0a83fbb9e77..24261919e13 100755 --- a/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile +++ b/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile @@ -1,4 +1,4 @@ -ARG BIGDL_VERSION=2.0.0-SNAPSHOT +ARG BIGDL_VERSION=2.0.0 ARG SPARK_VERSION=3.1.2 ARG FLINK_VERSION=1.11.3 ARG SCALA_VERSION=2.12 @@ -34,7 +34,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ARG FLINK_VERSION=1.11.3 ENV FLINK_VERSION ${FLINK_VERSION} ENV FLINK_HOME /opt/flink-${FLINK_VERSION} -ARG BIGDL_VERSION=2.0.0-SNAPSHOT +ARG BIGDL_VERSION=2.0.0 ENV BIGDL_VERSION=${BIGDL_VERSION} ARG SPARK_VERSION=3.1.2 ARG SCALA_VERSION=2.12 @@ -88,7 +88,7 @@ RUN cd /opt && \ FROM occlum/occlum:0.27.0-ubuntu20.04 as ppml ARG FLINK_VERSION=1.11.3 -ARG BIGDL_VERSION=2.0.0-SNAPSHOT +ARG BIGDL_VERSION=2.0.0 ARG SCALA_VERSION=2.12 ARG SCALA_SUB_VERSION_NUM=10 diff --git a/scala/ppml/demo/Dockerfile b/scala/ppml/demo/Dockerfile index dd133e3eca4..bcb4d7ca59a 100644 --- a/scala/ppml/demo/Dockerfile +++ b/scala/ppml/demo/Dockerfile @@ -1,4 +1,4 @@ -FROM intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:0.14.0-SNAPSHOT +FROM intelanalytics/bigdl-ppml-trusted-big-data-ml-python-graphene:2.0.0 RUN NIGHTLY_VERSION=$(echo $(echo `wget -qO - https://oss.sonatype.org/content/repositories/snapshots/com/intel/analytics/bigdl/bigdl-ppml-spark_$SPARK_VERSION/$BIGDL_VERSION/maven-metadata.xml \ | sed -n '/[0-9]*\.[0-9]*\.[0-9]*-[0-9][0-9]*\.[0-9][0-9]*-[0-9][0-9]*.*value>/p' | head -n1 | awk -F'>' '{print $2}' | tr '