fix docker issues due to version update (#4280)

* fix docker issues * fix docker issues
intel-analytics · Jul 13, 2021 · 3f3c6df · 3f3c6df
1 parent deb1e42
commit 3f3c6df
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 18 deletions.
diff --git a/docker/hyperzoo/Dockerfile b/docker/hyperzoo/Dockerfile
@@ -153,7 +153,8 @@ RUN mkdir -p /opt/analytics-zoo-examples/python && \
 # chmod
     chmod a+x /opt/start-notebook-spark.sh && \
     chmod a+x /opt/start-notebook-k8s.sh && \
-    chmod +x /sbin/tini
+    chmod +x /sbin/tini && \
+    cp /sbin/tini /usr/bin/tini    
 
 WORKDIR /opt/spark/work-dir
 

diff --git a/docs/readthedocs/source/doc/PPML/Overview/ppml.md b/docs/readthedocs/source/doc/PPML/Overview/ppml.md
@@ -76,7 +76,7 @@ Download scripts and dockerfiles from [this link](https://github.com/intel-analy
 
 Pull docker image from Dockerhub
 ```bash
-docker pull intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.10-SNAPSHOT
+docker pull intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.12.0-SNAPSHOT
 ```
 
 Alternatively, you can build docker image from Dockerfile (this will take some time):
@@ -629,12 +629,12 @@ Pull docker image from Dockerhub
 
 ```bash
 # For Graphene
-docker pull intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.10-SNAPSHOT
+docker pull intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.12.0-SNAPSHOT
 ```
 
 ```bash
 # For Occlum
-docker pull intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.10-SNAPSHOT
+docker pull intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.12.0-SNAPSHOT
 ```
 
 Also, you can build docker image from Dockerfile (this will take some time).

diff --git a/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile b/ppml/trusted-big-data-ml/python/docker-graphene/Dockerfile
@@ -161,6 +161,7 @@ RUN apt-get install -y python3-minimal && \
     #Fix tornado await process
     pip uninstall -y -q tornado && \
     pip install tornado && \
+    pip install filelock && \
     python3 -m ipykernel.kernelspec
 
 ADD ./bash.manifest.template /ppml/trusted-big-data-ml/bash.manifest.template

diff --git a/ppml/trusted-big-data-ml/scala/docker-graphene/README.md b/ppml/trusted-big-data-ml/scala/docker-graphene/README.md
@@ -47,10 +47,10 @@ sudo bash ../../../scripts/generate-password.sh used_password_when_generate_keys
 
 #### In spark local mode
 ##### Start the container to run spark applications in ppml
-Before you run the following commands to start the container, you need to modify the paths in `deploy-local-big-data-ml.sh`. <br>
+Before you run the following commands to start the container, you need to modify the paths in `./deploy-local-spark-sgx.sh`. <br>
 Then run the following commands: <br>
 ```bash
-./deploy-local-big-data-ml.sh
+./deploy-local-spark-sgx.sh
 sudo docker exec -it spark-local bash
 cd /ppml/trusted-big-data-ml
 ```

diff --git a/ppml/trusted-big-data-ml/scala/docker-graphene/build-docker-image.sh b/ppml/trusted-big-data-ml/scala/docker-graphene/build-docker-image.sh
@@ -13,4 +13,4 @@ sudo docker build \
     --build-arg JDK_VERSION=8u192 \
     --build-arg JDK_URL=$JDK_URL \
     --build-arg no_proxy=x.x.x.x \
-    -t intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.10-SNAPSHOT -f ./Dockerfile .
+    -t intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.12.0-SNAPSHOT -f ./Dockerfile .
diff --git a/ppml/trusted-big-data-ml/scala/docker-graphene/deploy-local-spark-sgx.sh b/ppml/trusted-big-data-ml/scala/docker-graphene/deploy-local-spark-sgx.sh
@@ -5,7 +5,7 @@ export DATA_PATH=the_dir_path_of_your_prepared_data
 export KEYS_PATH=the_dir_path_of_your_prepared_keys
 export LOCAL_IP=your_local_ip_of_the_sgx_server
 
-sudo docker pull intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.10-SNAPSHOT 
+sudo docker pull intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.12.0-SNAPSHOT 
 
 sudo docker run -itd \
     --privileged \
@@ -22,4 +22,4 @@ sudo docker run -itd \
     --name=spark-local \
     -e LOCAL_IP=$LOCAL_IP \
     -e SGX_MEM_SIZE=64G \
-    intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.10-SNAPSHOT
+    intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.12.0-SNAPSHOT
diff --git a/ppml/trusted-big-data-ml/scala/docker-graphene/environment.sh b/ppml/trusted-big-data-ml/scala/docker-graphene/environment.sh
@@ -3,7 +3,7 @@
 export MASTER=YOUR_MASTER_IP
 export WORKERS=(YOUR_WORKER_IP_1 YOUR_WORKER_IP_2 YOUR_WORKER_IP_3)
 
-export TRUSTED_BIGDATA_ML_DOCKER=intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.10-SNAPSHOT
+export TRUSTED_BIGDATA_ML_DOCKER=intelanalytics/analytics-zoo-ppml-trusted-big-data-ml-scala-graphene:0.12.0-SNAPSHOT
 
 export SOURCE_ENCLAVE_KEY_PATH=YOUR_LOCAL_ENCLAVE_KEY_PATH
 export SOURCE_KEYS_PATH=YOUR_LOCAL_KEYS_PATH

diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile b/ppml/trusted-realtime-ml/scala/docker-graphene/Dockerfile
@@ -60,7 +60,7 @@ COPY --from=flink /opt/jdk  /opt/jdk8
 
 RUN apt-get update --fix-missing && \
     apt-get install -y apt-utils curl wget unzip git maven
-RUN git clone https://github.com/intel-analytics/analytics-zoo.git && \
+RUN git clone --single-branch --branch master https://github.com/intel-analytics/analytics-zoo.git && \
     cd analytics-zoo/zoo && \
     export MAVEN_OPTS="-XX:ReservedCodeCacheSize=512m -XX:MaxPermSize=3G \
         -Dhttp.proxyHost=$HTTP_PROXY_HOST \

diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/build-docker-image.sh b/ppml/trusted-realtime-ml/scala/docker-graphene/build-docker-image.sh
@@ -14,4 +14,4 @@ sudo docker build \
     --build-arg JDK_VERSION=8u192 \
     --build-arg JDK_URL=$JDK_URL \
     --build-arg no_proxy=x.x.x.x \
-    -t intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.10-SNAPSHOT -f ./Dockerfile .
+    -t intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.12.0-SNAPSHOT -f ./Dockerfile .
diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/environment.sh b/ppml/trusted-realtime-ml/scala/docker-graphene/environment.sh
@@ -3,7 +3,7 @@
 export MASTER=YOUR_MASTER_IP
 export WORKERS=(YOUR_WORKER_IP_1 YOUR_WORKER_IP_2 YOUR_WORKER_IP_3)
 
-export TRUSTED_CLUSTER_SERVING_DOCKER=intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.10-SNAPSHOT
+export TRUSTED_CLUSTER_SERVING_DOCKER=intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.12.0-SNAPSHOT
 
 export SOURCE_ENCLAVE_KEY_PATH=YOUR_LOCAL_ENCLAVE_KEY_PATH
 export SOURCE_KEYS_PATH=YOUR_LOCAL_KEYS_PATH

diff --git a/ppml/trusted-realtime-ml/scala/docker-graphene/start-local-cluster-serving.sh b/ppml/trusted-realtime-ml/scala/docker-graphene/start-local-cluster-serving.sh
@@ -21,5 +21,5 @@ sudo docker run -itd \
     --name=trusted-cluster-serving-local \
     -e LOCAL_IP=$LOCAL_IP \
     -e CORE_NUM=30 \
-    intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.10-SNAPSHOT \
+    intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-graphene:0.12.0-SNAPSHOT \
     bash  -c "cd /ppml/trusted-realtime-ml/ && ./start-all.sh && tail -f /dev/null"
diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile b/ppml/trusted-realtime-ml/scala/docker-occlum/Dockerfile
@@ -51,7 +51,7 @@ RUN cd /opt && \
     rm flink-${FLINK_VERSION}-bin-scala_2.11.tgz
 
 # analytics-zoo
-RUN cd /opt && git clone https://github.com/intel-analytics/analytics-zoo.git && \
+RUN cd /opt && git clone --single-branch --branch master https://github.com/intel-analytics/analytics-zoo.git && \
     cd analytics-zoo/zoo && \
     export MAVEN_OPTS="-XX:ReservedCodeCacheSize=512m -XX:MaxPermSize=3G \
         -Dhttp.proxyHost=$HTTP_PROXY_HOST \

diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/build-docker-image.sh b/ppml/trusted-realtime-ml/scala/docker-occlum/build-docker-image.sh
@@ -11,4 +11,4 @@ sudo docker build \
     --build-arg HTTP_PROXY_PORT=$HTTP_PROXY_PORT \
     --build-arg HTTPS_PROXY_HOST=$HTTPS_PROXY_HOST \
     --build-arg HTTPS_PROXY_PORT=$HTTPS_PROXY_PORT \
-    -t intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.10-SNAPSHOT -f ./Dockerfile .
+    -t intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.12.0-SNAPSHOT -f ./Dockerfile .
diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/environment.sh b/ppml/trusted-realtime-ml/scala/docker-occlum/environment.sh
@@ -3,7 +3,7 @@
 export MASTER=YOUR_MASTER_IP
 export WORKERS=(YOUR_WORKER_IP_1 YOUR_WORKER_IP_2 YOUR_WORKER_IP_3)
 
-export TRUSTED_CLUSTER_SERVING_DOCKER=intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.10-SNAPSHOT
+export TRUSTED_CLUSTER_SERVING_DOCKER=intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.12.0-SNAPSHOT
 
 export SOURCE_KEYS_PATH=YOUR_LOCAL_KEYS_PATH
 export SOURCE_SECURE_PASSWORD_PATH=YOUR_LOCAL_SECURE_PASSWORD_PATH

diff --git a/ppml/trusted-realtime-ml/scala/docker-occlum/start-local-cluster-serving.sh b/ppml/trusted-realtime-ml/scala/docker-occlum/start-local-cluster-serving.sh
@@ -15,5 +15,5 @@ sudo docker run -itd \
     --name=trusted-cluster-serving-local \
     -e LOCAL_IP=$LOCAL_IP \
     -e CORE_NUM=30 \
-    intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.10-SNAPSHOT \
+    intelanalytics/analytics-zoo-ppml-trusted-realtime-ml-scala-occlum:0.12.0-SNAPSHOT \
     bash  -c "cd /opt/ && ./start-all.sh && tail -f /dev/null"