Merge pull request #153 from owlet42/feat/v2.1.6

Feat: docker build support v2.1.6

Author: forgivedengkai

docker-build/build_cluster_docker.sh

@@ -20,7 +20,7 @@ if [ -z "$PREFIX" ]; then
         PREFIX=federatedai
 fi
 
-version=$(git describe --tags)
+version=$(grep "<fate.version>" ${source_code_dir}/pom.xml  | sed "s/[<|>]/ /g" | awk '{print $2}')
 
 source .env
 
@@ -29,7 +29,9 @@ echo "Info:"
 echo "  version: ${version}"
 echo "  PREFIX: ${PREFIX}"
 echo "  Tag: ${TAG}"
-
+echo "  BASEDIR: ${BASEDIR}"
+echo "  WORKINGDIR: ${WORKINGDIR}"
+echo "  source_code_dir: ${source_code_dir}"
 
 package() {
   docker run --rm -u $(id -u):$(id -g) -v ${source_code_dir}:/data/projects/fate/FATE-Serving --entrypoint="" maven:3.6-jdk-8 /bin/bash -c "cd /data/projects/fate/FATE-Serving && mvn clean package -DskipTests"

docker-build/serving-admin/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/java/jre:8u192-zulu-alpine
+FROM mcr.microsoft.com/java/jre:8u192-zulu-alpine as builder
 
 
 WORKDIR /data/projects/fate-serving/serving-admin/
@@ -12,6 +12,14 @@ RUN unzip fate-serving-admin-${version}-release.zip && \
     rm fate-serving-admin-${version}-release.zip && \
     ln -s fate-serving-admin-*.jar fate-serving-admin.jar
 
+FROM mcr.microsoft.com/java/jre:8u192-zulu-centos
+
+WORKDIR /data/projects/fate-serving/serving-admin/
+
+COPY --from=builder /data/projects/fate-serving/serving-admin  /data/projects/fate-serving/serving-admin
+
+USER root
+
 EXPOSE 8350
 
 CMD java -Dspring.config.location=conf/application.properties -cp "conf/:lib/*:fate-serving-admin.jar" com.webank.ai.fate.serving.admin.Bootstrap

docker-build/serving-proxy/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/java/jre:8u192-zulu-alpine
+FROM mcr.microsoft.com/java/jre:8u192-zulu-alpine as builder
 
 WORKDIR /data/projects/fate-serving/serving-proxy/
 
@@ -12,6 +12,14 @@ RUN unzip fate-serving-proxy-${version}-release.zip && \
     rm fate-serving-proxy-${version}-release.zip && \
     ln -s fate-serving-proxy-*.jar fate-serving-proxy.jar
 
+FROM mcr.microsoft.com/java/jre:8u192-zulu-centos
+
+WORKDIR /data/projects/fate-serving/serving-proxy/
+
+COPY --from=builder /data/projects/fate-serving/serving-proxy  /data/projects/fate-serving/serving-proxy
+
+USER root
+
 EXPOSE 8059 8869 8879
 
 CMD java -Dspring.config.location=conf/application.properties -cp conf/:lib/*:fate-serving-proxy.jar com.webank.ai.fate.serving.proxy.bootstrap.Bootstrap -c conf/application.properties

docker-build/serving-server/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/java/jre:8u192-zulu-alpine
+FROM mcr.microsoft.com/java/jre:8u192-zulu-alpine as builder
 
 WORKDIR /data/projects/fate-serving/serving-server/
 
@@ -12,6 +12,14 @@ RUN unzip fate-serving-server-${version}-release.zip && \
     rm fate-serving-server-${version}-release.zip && \
     ln -s fate-serving-server-*.jar fate-serving-server.jar
 
+FROM mcr.microsoft.com/java/jre:8u192-zulu-centos
+
+WORKDIR /data/projects/fate-serving/serving-server/
+
+COPY --from=builder /data/projects/fate-serving/serving-server  /data/projects/fate-serving/serving-server
+
+USER root
+
 EXPOSE 8000
 
 CMD java -cp conf/:lib/*:extension/*:fate-serving-server.jar com.webank.ai.fate.serving.Bootstrap -c conf/serving-server.properties