fix: formatting dockerfiles for 2.0.0 (#251)

* formatting
unpinned awscli version
pinned numpy to a higher version

* correct format

* more format
add sagemaker-tensorflow>=2.0, <2.1

Author: Elizaaaaa

docker/2.0.0/py2/Dockerfile.cpu

@@ -5,6 +5,27 @@ LABEL maintainer="Amazon AI"
 # prevent stopping by user interaction
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
+ENV SAGEMAKER_TRAINING_MODULE sagemaker_tensorflow_container.training:main
+
+# Set environment variables for MKL
+# For more about MKL with TensorFlow see:
+# https://www.tensorflow.org/performance/performance_guide#tensorflow_with_intel%C2%AE_mkl_dnn
+ENV KMP_AFFINITY=granularity=fine,compact,1,0 
+ENV KMP_BLOCKTIME=1 
+ENV KMP_SETTINGS=0
+
+ENV PYTHONDONTWRITEBYTECODE=1 
+ENV PYTHONUNBUFFERED=1 
+ENV PYTHONIOENCODING=UTF-8 
+ENV LANG=C.UTF-8 
+ENV LC_ALL=C.UTF-8
+
+ARG FRAMEWORK_SUPPORT_INSTALLABLE=sagemaker_tensorflow_container-2.0.8.dev0.tar.gz
+ARG TENSORFLOW_WHL=tensorflow-2.0.0-cp27-cp27mu-manylinux2010_x86_64.whl
+
+ARG PYTHON=python
+ARG PYTHON_PIP=python-pip
+ARG PIP=pip
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     software-properties-common \
@@ -17,93 +38,82 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     wget \
     vim \
     zlib1g-dev \
-    && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/lib/apt/lists/*
 
 # Install Open MPI
-RUN mkdir /tmp/openmpi && \
-    cd /tmp/openmpi && \
-    curl -fSsL -O https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.1.tar.gz && \
-    tar zxf openmpi-4.0.1.tar.gz && \
-    cd openmpi-4.0.1 && \
-    ./configure --enable-orterun-prefix-by-default && \
-    make -j $(nproc) all && \
-    make install && \
-    ldconfig && \
-    rm -rf /tmp/openmpi
+RUN mkdir /tmp/openmpi \
+ && cd /tmp/openmpi \
+ && curl -fSsL -O https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.1.tar.gz \
+ && tar zxf openmpi-4.0.1.tar.gz \
+ && cd openmpi-4.0.1 \
+ && ./configure --enable-orterun-prefix-by-default \
+ && make -j $(nproc) all \
+ && make install \
+ && ldconfig \
+ && rm -rf /tmp/openmpi
 
 # Create a wrapper for OpenMPI to allow running as root by default
-RUN mv /usr/local/bin/mpirun /usr/local/bin/mpirun.real && \
-    echo '#!/bin/bash' > /usr/local/bin/mpirun && \
-    echo 'mpirun.real --allow-run-as-root "$@"' >> /usr/local/bin/mpirun && \
-    chmod a+x /usr/local/bin/mpirun
+RUN mv /usr/local/bin/mpirun /usr/local/bin/mpirun.real \
+ && echo '#!/bin/bash' > /usr/local/bin/mpirun \
+ && echo 'mpirun.real --allow-run-as-root "$@"' >> /usr/local/bin/mpirun \
+ && chmod a+x /usr/local/bin/mpirun
 
-RUN echo "hwloc_base_binding_policy = none" >> /usr/local/etc/openmpi-mca-params.conf && \
-    echo "rmaps_base_mapping_policy = slot" >> /usr/local/etc/openmpi-mca-params.conf
+RUN echo "hwloc_base_binding_policy = none" >> /usr/local/etc/openmpi-mca-params.conf \
+ && echo "rmaps_base_mapping_policy = slot" >> /usr/local/etc/openmpi-mca-params.conf
 
 ENV LD_LIBRARY_PATH=/usr/local/openmpi/lib:$LD_LIBRARY_PATH
-
 ENV PATH /usr/local/openmpi/bin/:$PATH
 
 # SSH login fix. Otherwise user is kicked off after login
 RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
 
 # Create SSH key.
-RUN mkdir -p /root/.ssh/ && \
-    mkdir -p /var/run/sshd && \
-    ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa && \
-    cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys && \
-    printf "Host *\n  StrictHostKeyChecking no\n" >> /root/.ssh/config
-
-# Set environment variables for MKL
-# For more about MKL with TensorFlow see:
-# https://www.tensorflow.org/performance/performance_guide#tensorflow_with_intel%C2%AE_mkl_dnn
-ENV KMP_AFFINITY=granularity=fine,compact,1,0 KMP_BLOCKTIME=1 KMP_SETTINGS=0
+RUN mkdir -p /root/.ssh/ \
+ && mkdir -p /var/run/sshd \
+ && ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa \
+ && cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys \
+ && printf "Host *\n  StrictHostKeyChecking no\n" >> /root/.ssh/config
 
 WORKDIR /
 
-ARG PYTHON=python
-ARG PYTHON_PIP=python-pip
-ARG PIP=pip
-
 RUN apt-get update && apt-get install -y \
     ${PYTHON} \
     ${PYTHON_PIP}
 
-ENV PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1 PYTHONIOENCODING=UTF-8 LANG=C.UTF-8 LC_ALL=C.UTF-8
-
-ARG framework_support_installable=sagemaker_tensorflow_container-2.0.8.dev0.tar.gz
-ARG sagemaker_tensorflow_extensions=tensorflow-2.0.0-cp27-cp27mu-manylinux2010_x86_64.whl
-COPY $framework_support_installable .
-COPY $sagemaker_tensorflow_extensions .
+COPY $FRAMEWORK_SUPPORT_INSTALLABLE .
+COPY $TENSORFLOW_WHL .
 
-RUN ${PIP} --no-cache-dir install --upgrade pip setuptools
+RUN ${PIP} --no-cache-dir install --upgrade \
+    pip \
+    setuptools
 
 # Some TF tools expect a "python" binary
 RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
 
 RUN ${PIP} install --no-cache-dir -U \
-            numpy==1.16.4 \
-            scipy==1.2.2 \
-            scikit-learn==0.20.3 \
-            pandas==0.24.2 \
-            Pillow==6.1.0 \
-            h5py==2.9.0 \
-            keras_applications==1.0.8 \
-            keras_preprocessing==1.1.0 \
-            requests==2.22.0 \
-            keras==2.2.4 \
-            awscli==1.16.196 \
-            mpi4py==3.0.2 \
-            $sagemaker_tensorflow_extensions \
-            # Let's install TensorFlow separately in the end to avoid
-            # the library version to be overwritten
-    # && ${PIP} install --force-reinstall --no-cache-dir -U ${TF_URL} \
-    && ${PIP} install --no-cache-dir -U $framework_support_installable && \
-        rm -f $framework_support_installable \
-    && ${PIP} install --no-cache-dir -U horovod==0.18.2 \
-    && ${PIP} uninstall -y --no-cache-dir \
-        markdown
-
-ENV SAGEMAKER_TRAINING_MODULE sagemaker_tensorflow_container.training:main
+    numpy==1.16.5 \
+    scipy==1.2.2 \
+    scikit-learn==0.20.3 \
+    pandas==0.24.2 \
+    Pillow==6.1.0 \
+    h5py==2.9.0 \
+    keras_applications==1.0.8 \
+    keras_preprocessing==1.1.0 \
+    requests==2.22.0 \
+    keras==2.3.1 \
+    awscli \
+    mpi4py==3.0.2 \
+    # Let's install TensorFlow separately in the end to avoid
+    # the library version to be overwritten
+    # ${PIP} install --force-reinstall --no-cache-dir -U ${TF_URL} \
+ && ${PIP} install --force-reinstall --no-cache-dir -U \
+    $TENSORFLOW_WHL \
+ && ${PIP} install --no-cache-dir -U \
+    $FRAMEWORK_SUPPORT_INSTALLABLE \
+ && rm -f $FRAMEWORK_SUPPORT_INSTALLABLE \
+ && ${PIP} install --no-cache-dir -U \
+    horovod==0.18.2 \
+ && ${PIP} uninstall -y --no-cache-dir \
+    markdown
 
 CMD ["bin/bash"]