diff --git a/devops/Jenkinsfile b/devops/Jenkinsfile index f670ddee14..4bf24bc8c5 100644 --- a/devops/Jenkinsfile +++ b/devops/Jenkinsfile @@ -274,6 +274,7 @@ pipeline { sh 'docker push $REGISTRY_DEV/$DOCKER_NAMESPACE$APP_NAME_PREMISE_SLAVE:$VERSION_DEV' withCredentials([usernamePassword(passwordVariable : 'DOCKERHUB_PASSWORD' ,usernameVariable : 'DOCKERHUB_USERNAME' ,credentialsId : "$DOCKERHUB_CREDENTIAL_ID" ,)]) { + sh 'docker logout' sh 'docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD' sh 'docker tag $REGISTRY_DEV/$DOCKER_NAMESPACE$APP_NAME_EDGE_CLIENT_SERVER:$VERSION_DEV fedml/fedml-edge-client-server:latest' @@ -406,7 +407,7 @@ pipeline { credentialsId: env.DEV_KUBECONFIG_CREDENTIAL_ID, variable: 'KUBECONFIG') ]) { - sh 'kubectl rollout restart -n $DEPLOY_NAMESPACE_DEV deployment/fedml-cloud-server' + //sh 'kubectl rollout restart -n $DEPLOY_NAMESPACE_DEV deployment/fedml-cloud-server' sh 'kubectl scale -n $DEPLOY_NAMESPACE_DEV --replicas=0 deployment/$DEPLOY_NAME' sh 'kubectl scale -n $DEPLOY_NAMESPACE_DEV --replicas=1 deployment/$DEPLOY_NAME' @@ -469,7 +470,7 @@ pipeline { credentialsId: env.PRODUCTION_KUBECONFIG_CREDENTIAL_ID, variable: 'KUBECONFIG') ]) { - sh 'kubectl rollout restart -n $DEPLOY_NAMESPACE_PRODUCTION deployment/fedml-cloud-server' + //sh 'kubectl rollout restart -n $DEPLOY_NAMESPACE_PRODUCTION deployment/fedml-cloud-server' sh 'kubectl scale -n $DEPLOY_NAMESPACE_PRODUCTION --replicas=0 deployment/$DEPLOY_NAME' sh 'kubectl scale -n $DEPLOY_NAMESPACE_PRODUCTION --replicas=1 deployment/$DEPLOY_NAME' diff --git a/devops/scripts/build-fedml-docker.sh b/devops/scripts/build-fedml-docker.sh index a64b30dc0f..97fe0d1c9d 100755 --- a/devops/scripts/build-fedml-docker.sh +++ b/devops/scripts/build-fedml-docker.sh @@ -98,3 +98,10 @@ if [ "$build_arm_arch_images" != "" ]; then cd $pwd fi + +cd ./installation/build_fedml_docker +docker build -f light/Dockerfile \ + --network=host \ + -t fedml/fedml:light . + + diff --git a/python/fedml/__init__.py b/python/fedml/__init__.py index 271e1fbe87..9303a4dbf3 100644 --- a/python/fedml/__init__.py +++ b/python/fedml/__init__.py @@ -25,7 +25,7 @@ _global_training_type = None _global_comm_backend = None -__version__ = "0.8.4a38" +__version__ = "0.8.4" def init(args=None): diff --git a/python/setup.py b/python/setup.py index 1973035ddf..026ffb131e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -90,7 +90,7 @@ def finalize_options(self): setup( name="fedml", - version="0.8.4a38", + version="0.8.4", author="FedML Team", author_email="ch@fedml.ai", description="A research and production integrated edge-cloud library for "