Merge branch 'feat/support/fate-v1.8.0'

.github/workflows/fate-push.yml

@@ -0,0 +1,48 @@
+name: Push fate images to DockerHub
+
+on:
+  push:
+    # Publish `master` as Docker `latest` image.
+    branches:
+      - master
+      - jenkins-integration
+
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+jobs:
+  # no test is required
+  push:
+    runs-on: ubuntu-18.04
+    if: github.event_name == 'push'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Prepare the TAG
+        id: prepare-the-tag
+        run: |
+          # strip git ref prefix from version
+          TAG=""
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          if [ $VERSION = "master" ]; then
+            export TAG=latest
+          else
+            export TAG=${VERSION##*v}-release
+          fi
+          echo "::set-output name=tag::$TAG"
+      - name: Build image
+        run: |
+          export IMG_TAG=${{steps.prepare-the-tag.outputs.tag}}
+          cd docker-build
+          bash docker-build.sh all
+
+      - name: Log into DockerHub
+        run: docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Push image
+        run: |
+          export IMG_TAG=${{steps.prepare-the-tag.outputs.tag}}
+          cd docker-build
+          bash docker-build.sh push

.github/workflows/push.yml → .github/workflows/kubefate-push.yml

@@ -1,11 +1,10 @@
-name: Publish
+name: Push kubefate service image to DockerHub
 
 on:
   push:
     # Publish `master` as Docker `latest` image.
     branches:
       - master
-      - jenkins-integration
 
     # Publish `v1.2.3` tags as releases.
     tags:

.gitignore

@@ -11,3 +11,4 @@ dist/
 *.out
 *.tgz
 *.tar
+release/

docker-build/.env

@@ -1,2 +1,2 @@
 #PREFIX=federatedai
-#IMG_TAG=1.7.2-release
+#IMG_TAG=1.8.0-release

docker-build/client/Dockerfile

@@ -2,7 +2,7 @@ ARG SOURCE_PREFIX=federatedai
 ARG SOURCE_TAG=1.5.0-release
 FROM ${SOURCE_PREFIX}/python:${SOURCE_TAG} as data
 
-FROM python:3.7
+FROM python:3.6
 
 COPY pipeline /data/projects/fate/pipeline
 RUN pip install notebook fate-client pandas sklearn

docker-build/docker-build.sh

@@ -14,8 +14,12 @@
 
 set -e
 
-PREFIX=federatedai
-IMG_TAG=latest
+if [ -z "$IMG_TAG" ]; then
+        IMG_TAG=latest
+fi
+if [ -z "$PREFIX" ]; then
+        PREFIX=federatedai
+fi
 
 source .env
 

docker-deploy/.env

@@ -1,5 +1,5 @@
 RegistryURI=
-TAG=1.7.2-release
+TAG=1.8.0-release
 SERVING_TAG=2.0.4-release
 
 # PREFIX: namespace on the registry's server.

docker-deploy/training_template/docker-compose-eggroll.yml

@@ -117,6 +117,12 @@ services:
     networks:
       fate-network:
         ipv4_address: 192.167.0.100
+    healthcheck:
+      test: ["CMD", "curl", "-f", "-X POST", "http://192.167.0.100:9380/v1/version/get"]
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
     command:
     - "/bin/bash"
     - "-c"

docker-deploy/training_template/docker-compose-spark-slim.yml

@@ -71,6 +71,12 @@ services:
     networks:
       fate-network:
         ipv4_address: 192.167.0.100
+    healthcheck:
+      test: ["CMD", "curl", "-f", "-X POST", "http://192.167.0.100:9380/v1/version/get"]
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
     command:
     - "/bin/bash"
     - "-c"

docker-deploy/training_template/docker-compose-spark.yml

@@ -70,6 +70,12 @@ services:
     networks:
       fate-network:
         ipv4_address: 192.167.0.100
+    healthcheck:
+      test: ["CMD", "curl", "-f", "-X POST", "http://192.167.0.100:9380/v1/version/get"]
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
     command:
     - "/bin/bash"
     - "-c"

docker-deploy/training_template/public/fateboard/conf/application.properties

@@ -1,29 +1,20 @@
 server.port=8080
-fateflow.url=
-spring.datasource.driver-Class-Name=com.mysql.cj.jdbc.Driver
+fateflow.url=http://localhost:9380
+fateflow.http_app_key=
+fateflow.http_secret_key=
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.enabled=true
 server.tomcat.uri-encoding=UTF-8
-fateboard.datasource.jdbc-url=<jdbc.url>
-fateboard.datasource.username=<jdbc.username>
-fateboard.datasource.password=<jdbc.password>
+fateboard.front_end.cors=false
+fateboard.front_end.url=http://localhost:8028
 server.tomcat.max-threads=1000
 server.tomcat.max-connections=20000
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=100MB
-spring.datasource.druid.filter.config.enabled=false
-spring.datasource.druid.web-stat-filter.enabled=false
-spring.datasource.druid.stat-view-servlet.enabled=false
 server.compression.enabled=true
 server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain
 server.board.login.username=<fateboard.username>
 server.board.login.password=<fateboard.password>
-management.endpoints.web.exposure.exclude=*
-#server.ssl.key-store=classpath:
-#server.ssl.key-store-password=
-#server.ssl.key-password=
-#server.ssl.key-alias=
-spring.session.store-type=jdbc
-spring.session.jdbc.initialize-schema=always
-#HTTP_APP_KEY=
-#HTTP_SECRET_KEY=
+server.servlet.session.timeout=4h
+server.servlet.session.cookie.max-age=4h
+management.endpoints.web.exposure.exclude=*