[Docker] Update scripts to differentiate runtime/devel images

Author: Weiming Zhao

utils/docker/Dockerfile

@@ -1,7 +1,7 @@
 # Build this image:  docker build -t halo:[version] .
 
 ARG BASE_IMAGE
-FROM ${BASE_IMAGE} 
+FROM ${BASE_IMAGE}
 
 # Redeclare the argument
 ARG BASE_IMAGE
@@ -73,7 +73,7 @@ RUN apt-get update -y && \
       ninja-build \
       libopencv-core-dev \
       libopencv-highgui-dev \
-      libopencv-videoio-dev \ 
+      libopencv-videoio-dev \
       libmpc-dev \
       libmpfr-dev \
       libgmp-dev\
@@ -226,7 +226,7 @@ RUN cd /tmp && \
     git clone --depth=1 https://github.com/google/flatbuffers.git -b v1.12.0 && \
     cd flatbuffers && \
     cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release  -DFLATBUFFERS_BUILD_SHAREDLIB=ON && make -j && make install && \
-    rm -fr /tmp/flatbuffers 
+    rm -fr /tmp/flatbuffers
 
 
 RUN mkdir -p /var/run/sshd

utils/docker/build_image.sh

@@ -1,10 +1,14 @@
 #!/bin/bash
 
+VER="latest"
+FLAVOR="devel"
+NAMESPACE="registry-intl.us-west-1.aliyuncs.com/computation"
+
 base_image_gpu="nvidia/cuda:10.0-cudnn7-devel-ubuntu18.04"
 base_image_cpu="ubuntu:18.04"
 
 docker build --build-arg BASE_IMAGE=${base_image_cpu} \
-  -t latest-x86_64-ubuntu18.04 .
+  -t $NAMESPACE/halo:$VER-$FLAVOR-x86_64-ubuntu18.04 .
 
 docker build --build-arg BASE_IMAGE=${base_image_gpu} \
-  -t latest-cuda10.0-cudnn7-ubuntu18.04 .
+  -t $NAMESPACE/halo:$VER-$FLAVOR-cuda10.0-cudnn7-ubuntu18.04 .

utils/docker/start_docker_cpu.sh

@@ -1,15 +1,16 @@
 #!/bin/bash -xe
 
 VER="latest"
+FLAVOR="devel"
 NAMESPACE="registry-intl.us-west-1.aliyuncs.com/computation"
 
 if [[ "$0" =~ "start_docker_gpu.sh" ]]; then
-  IMAGE="$NAMESPACE/halo:$VER-cuda10.0-cudnn7-ubuntu18.04"
+  IMAGE="$NAMESPACE/halo:$VER-$FLAVOR-cuda10.0-cudnn7-ubuntu18.04"
   CONTAINER_NAME=$USER.halo-$VER-GPU
   docker_run_flag="--runtime=nvidia"
 else
   use_gpu=0
-  IMAGE="$NAMESPACE/halo:$VER-x86_64-ubuntu18.04"
+  IMAGE="$NAMESPACE/halo:$VER-$FLAVOR-x86_64-ubuntu18.04"
   CONTAINER_NAME=$USER.halo-$VER-CPU
   docker_run_flag=""
 fi