[DevOps] Update the training Dockerfile for multi stages building (Debugging...).

Author: fedml-alex

devops/dockerfile/multi-stages-build/Dockerfile-Traing-Dev

@@ -40,7 +40,6 @@ RUN pip3 install -r ./fedml/requirements.txt
 RUN pip3 install --upgrade gevent
 
 
-ARG BASE_IMAGE=public.ecr.aws/x6k8q1x9/fedml-device-image:base
 FROM ${BASE_IMAGE} AS fedml-training-env-base
 
 ADD ./devops/scripts/runner.sh ./fedml/runner.sh
@@ -70,7 +69,7 @@ RUN pip3 install MNN==1.1.6
 WORKDIR /fedml
 
 COPY --from=fedml-training-env-base /fedml/fedml-pip /fedml/fedml-pip
-COPY --from=fedml-training-env-base /fedml/fedml-pip/python/fedml ${FEDML_PIP_HOME}
+COPY --from=fedml-training-env-base /fedml/fedml-pip/fedml ${FEDML_PIP_HOME}
 
 ENV MODE=normal FEDML_VERSION=${VERSION} ACCOUNT_ID=0 SERVER_DEVICE_ID=0 \
     FEDML_PACKAGE_NAME=package FEDML_PACKAGE_URL=s3_url \
@@ -84,7 +83,7 @@ FROM ${BASE_IMAGE} AS fedml-client-agent
 WORKDIR /fedml
 
 COPY --from=fedml-training-env-base /fedml/fedml-pip /fedml/fedml-pip
-COPY --from=fedml-image-base /fedml/fedml-pip/python/fedml ${FEDML_PIP_HOME}
+COPY --from=fedml-training-env-base /fedml/fedml-pip/fedml ${FEDML_PIP_HOME}
 
 ENV ACCOUNT_ID=0 FEDML_VERSION=${VERSION} CLIENT_DEVICE_ID=0 CLIENT_OS_NAME=linux
 

devops/scripts/push-fedml-docker.sh

@@ -4,20 +4,20 @@ push_arm_arch_images=$1
 
 export FEDML_VERSION=`cat python/setup.py |grep version= |awk -F'=' '{print $2}' |awk -F',' '{print $1}'|awk -F'"' '{print $2}'`
 if [[ $push_arm_arch_images == "" ]]; then
-  docker push fedml/fedml:latest-torch1.12.1-cuda11.3-cudnn8-devel
-  docker push fedml/fedml:${FEDML_VERSION}-torch1.12.1-cuda11.3-cudnn8-devel
+  docker push fedml/fedml:latest-torch1.13.1-cuda11.6-cudnn8-devel
+  docker push fedml/fedml:${FEDML_VERSION}-torch1.13.1-cuda11.6-cudnn8-devel
 fi
 
 if [[ $push_arm_arch_images != "" ]]; then
-  docker push fedml/fedml:latest-torch1.12.1-cuda11.3-cudnn8-devel-arm64
-  docker push fedml/fedml:${FEDML_VERSION}-torch1.12.1-cuda11.3-cudnn8-devel-arm64
+  docker push fedml/fedml:latest-arm64-torch1.13.1-cuda11.6-cudnn8-devel
+  docker push fedml/fedml:${FEDML_VERSION}-arm64-torch1.13.1-cuda11.6-cudnn8-devel-arm64
 
   docker push fedml/fedml:latest-nvidia-jetson-l4t-ml-r35.1.0-py3
   docker push fedml/fedml:${FEDML_VERSION}-nvidia-jetson-l4t-ml-r35.1.0-py3
 
-#  docker push fedml/fedml:latest-raspberrypi4-32-py37
-#  docker push fedml/fedml:${FEDML_VERSION}-raspberrypi4-32-py37
+#  docker push fedml/fedml:latest-raspberrypi4-32-py38
+#  docker push fedml/fedml:${FEDML_VERSION}-raspberrypi4-32-py38
 
-  docker push fedml/fedml:latest-raspberrypi4-64-py37
-  docker push fedml/fedml:${FEDML_VERSION}-raspberrypi4-64-py37
+  docker push fedml/fedml:latest-raspberrypi4-64-py38
+  docker push fedml/fedml:${FEDML_VERSION}-raspberrypi4-64-py38
 fi