Merge pull request #14 from jinlmsft/master

Update Dockerfile

src/docker-images/algorithm-bert/Dockerfile

@@ -1,6 +1,6 @@
-FROM qianjiangyuan/tutorial-horovod:1.7
+FROM qianjiangyuan/tutorial-horovod:1.8
 MAINTAINER Jin Li <[email protected]>
 
 RUN git clone https://github.com/NVIDIA/apex.git && cd apex && python setup.py install --cuda_ext --cpp_ext
 
-RUN pip install pytorch-pretrained-bert pytest
+RUN pip install pytorch-pretrained-bert pytest

src/docker-images/algorithm-mmdetection/Dockerfile

@@ -11,4 +11,7 @@ RUN apt-get update && apt-get install -y libglib2.0-0 libsm6 libxrender-dev libx
 RUN conda install cython -y
 RUN git clone https://github.com/open-mmlab/mmdetection.git /mmdetection
 WORKDIR /mmdetection
-RUN pip install -e .
+RUN pip install -e .
+RUN python3 -m pip install jupyter jupyterlab
+RUN python3 -m pip install ipykernel
+RUN python3 -m ipykernel install --user

src/docker-images/algorithm-segmentation/Dockerfile

@@ -28,16 +28,16 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
         zip \
         libcurl3-dev \
         libfreetype6-dev \
-        libpng12-dev \
+        libpng-dev \
         libzmq3-dev \
         pkg-config \
-        python3.5-dev \
+        python3.6-dev \
         zlib1g-dev \
         libopencv-dev \
         # python3-opencv \
 		python3-tk \
         build-essential autoconf libtool libcunit1-dev \
-        libproj-dev libgdal-dev libgeos-dev libjson0-dev vim python3-gdal \
+        libproj-dev libgdal-dev libgeos-dev libjson-c-dev vim python3-gdal \
     	# requirements for keras
     	python3-h5py \
     	python3-yaml \
@@ -112,7 +112,7 @@ RUN pip3 install jupyterlab
 RUN python3 -m pip install ipykernel
 RUN python3 -m ipykernel install --user
 
-RUN rm /usr/bin/python && ln -s /usr/bin/python3.5 /usr/bin/python
+RUN rm /usr/bin/python && ln -s /usr/bin/python3.6 /usr/bin/python
 
 RUN apt-get update -y && apt-get install -y gdal-bin xauth xfonts-base
 

src/docker-images/nginx/default.conf

@@ -15,5 +15,7 @@ server {
         include /etc/nginx/conf.other/*.conf;
 }
 
+include /etc/nginx/conf.other/*.map; 
+
 
 

src/docker-images/tutorial-horovod/Dockerfile

@@ -1,8 +1,23 @@
-FROM horovod/horovod:0.16.1-tf1.12.0-torch1.0.0-mxnet1.4.0-py3.5
+FROM horovod/horovod:0.18.1-tf1.14.0-torch1.2.0-mxnet1.5.0-py3.6
 MAINTAINER Jin Li <[email protected]>
 
 # RUN rm -rf /var/lib/apt/lists/*
+# Add network tools for debug
 RUN umask 022
+
+## for apt to be noninteractive
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
+
+## preesed tzdata, update package index, upgrade packages and install needed software
+RUN echo "tzdata tzdata/Areas select America" > /tmp/preseed.txt; \
+    echo "tzdata tzdata/Zones/America select Los_Angeles" >> /tmp/preseed.txt; \
+    debconf-set-selections /tmp/preseed.txt && \
+    # rm /etc/timezone && \
+    # rm /etc/localtime && \
+    apt-get update && \
+    apt-get install -y tzdata
+
 RUN apt-get -y update && \
     apt-get -y install \
       vim \
@@ -19,7 +34,19 @@ RUN apt-get -y update && \
       openssh-server \
       sudo \
       nodejs \
-      software-properties-common
+      software-properties-common \
+      net-tools \
+      dnsutils \
+      openssh-server \
+      sudo \
+      inetutils-ping inetutils-traceroute
+
+RUN echo $'# Add by Dockerfile\n\
+AddressFamily inet\n\
+AllowTcpForwarding yes\n\
+X11UseLocalhost yes\n\
+X11DisplayOffset 10\n\
+' >> /etc/ssh/sshd_config
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         build-essential \
@@ -99,6 +126,7 @@ RUN pip3 install jupyterlab
 RUN python3 -m pip install ipykernel
 RUN python3 -m ipykernel install --user
 
+
 #Telemetry
 #--------------
 #The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include command-line arguments. The data is collected by Microsoft and shared with the community.