From beeb2e1c083f80ecc6e200e2bb4a13af05684854 Mon Sep 17 00:00:00 2001 From: robbie228 Date: Tue, 3 Sep 2024 14:44:22 +0800 Subject: [PATCH] update fateboard version & update docker-compose-eggroll & generate_config Signed-off-by: robbie228 --- docker-deploy/.env | 2 +- docker-deploy/generate_config.sh | 8 ++++---- .../training_template/docker-compose-eggroll.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-deploy/.env b/docker-deploy/.env index 9ac4a2900..1f02603a6 100644 --- 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 index 254b95343..7fc02165e 100755 --- 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##${fateboard_username}#g" ./confs-"$party_id"/confs/fateboard/conf/application.properties - sed -i "s##${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##${fateboard_username}#g" ./confs-"$party_id"/confs/fate_board/conf/application.properties + sed -i "s##${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 index d563a5b8e..015415d7f 100644 --- 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