update fateboard version & update docker-compose-eggroll & generate_c…

…onfig Signed-off-by: robbie228 <[email protected]>
FederatedAI · Sep 3, 2024 · beeb2e1 · beeb2e1
1 parent 530bc34
commit beeb2e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docker-deploy/.env b/docker-deploy/.env
@@ -15,7 +15,7 @@ KubeFATE_Version=v2.2.0-release
 FATEFlow_IMAGE="federatedai/fateflow"
 FATEFlow_IMAGE_TAG="2.2.0-release"
 FATEBoard_IMAGE="federatedai/fateboard"
-FATEBoard_IMAGE_TAG="2.1.1-release"
+FATEBoard_IMAGE_TAG="2.2.0-release"
 MySQL_IMAGE="mysql"
 MySQL_IMAGE_TAG="8.0.28"
 Client_IMAGE="federatedai/client"

diff --git a/docker-deploy/generate_config.sh b/docker-deploy/generate_config.sh
@@ -321,10 +321,10 @@ GenerateConfig() {
 
 		# Start the general config rendering
 		# fateboard
-		sed -i "s#^server.port=.*#server.port=${fateboard_port}#g" ./confs-"$party_id"/confs/fateboard/conf/application.properties
-		sed -i "s#^fateflow.url=.*#fateflow.url=http://${fate_flow_ip}:${fate_flow_http_port}#g" ./confs-"$party_id"/confs/fateboard/conf/application.properties
-		sed -i "s#<server.board.login.username>#${fateboard_username}#g" ./confs-"$party_id"/confs/fateboard/conf/application.properties
-		sed -i "s#<server.board.login.password>#${fateboard_password}#g" ./confs-"$party_id"/confs/fateboard/conf/application.properties
+		sed -i "s#^server.port=.*#server.port=${fateboard_port}#g" ./confs-"$party_id"/confs/fate_board/conf/application.properties
+		sed -i "s#^fateflow.url=.*#fateflow.url=http://${fate_flow_ip}:${fate_flow_http_port}#g" ./confs-"$party_id"/confs/fate_board/conf/application.properties
+		sed -i "s#<server.board.login.username>#${fateboard_username}#g" ./confs-"$party_id"/confs/fate_board/conf/application.properties
+		sed -i "s#<server.board.login.password>#${fateboard_password}#g" ./confs-"$party_id"/confs/fate_board/conf/application.properties
 
 		echo fateboard module of "$party_id" done!
 

diff --git a/docker-deploy/training_template/docker-compose-eggroll.yml b/docker-deploy/training_template/docker-compose-eggroll.yml
@@ -146,7 +146,7 @@ services:
     - "-c"
     - |
         set -x
-        pip install cryptography && sleep 5 && python fate_flow/python/fate_flow/fate_flow_server.py --debug 
+        pkill -9 -f fate && sleep 5 && python fate_flow/python/fate_flow/fate_flow_server.py --debug 
         python /data/projects/fate/eggroll/python/setup.py install 
         sleep 10 && pipeline init --ip fateflow --port 9380 
         flow init --ip fateflow --port 9380