[New] fix startup steps.

Author: marsan-ma

Diff for: .gitignore

@@ -0,0 +1,2 @@
+files/supervisor/*
+NVIDIA*

Diff for: 2-start-mldm.sh

@@ -1,20 +1,16 @@
 #!/bin/bash
 
-mkdir $HOME/workspace/notebooks
+
+# [prepare dir for Jupyter]
+mkdir -p $HOME/workspace/notebooks
+
+# [start container with GPU support]
 nvidia-docker run -d \
   --name=mldm_gpu \
   -v $HOME/workspace:/home/workspace \
-  -p 8880-8899:8880-8899 \
-  -it marsan/mldm_gpu ipynb
+  -p 8880-8900:8880-8900 -p 80:80 -p 443:443 \
+  -it marsan/mldm_gpu
 
-#  --device /dev/nvidia0:/dev/nvidia0 \
-#  --device /dev/nvidia1:/dev/nvidia1 \
-#  --device /dev/nvidia2:/dev/nvidia2 \
-#  --device /dev/nvidia3:/dev/nvidia3 \
-#  --device /dev/nvidiactl:/dev/nvidiactl \
-#  --device /dev/nvidia-uvm:/dev/nvidia-uvm \
-  
- 
 ##  -h mldm_env \ 
 ##  -p 6800-6810:6800-6810 \
 ##docker run -it kaggle/python bash 

Diff for: Dockerfile

@@ -93,24 +93,31 @@ RUN pip install --upgrade mpld3 && \
 RUN conda install mkl
 RUN conda install libgfortran
 
-RUN pip install -U \
+RUN pip install \
   pandas \
   mongoengine \
   bottle \
   cherrypy \
   jieba3k \
   yolk3k \
-  azure \
+  azure
+
+RUN pip install \
   cython \
-  html5lib \
+  html5lib
+
+RUN pip install \
   pyyaml \
   demjson \
-  hanziconv \
+  hanziconv
+
+RUN pip install \
   ftfy \
   hiredis \
-  google-api-python-client
+  google-api-python-client \
+  regex
 
-RUN pip install -U \
+RUN pip install \
   Django \
   django-pipeline \
   django-bootstrap3 \
@@ -125,9 +132,9 @@ RUN pip install \
   django-dashing
 
 
-# MySQL
-RUN apt-get install -y python3-dev libmysqlclient-dev
-RUN pip install mysqlclient
+## MySQL
+#RUN apt-get install -y python3-dev libmysqlclient-dev
+#RUN pip install mysqlclient
 
 
 # pathos (python parallel process)
@@ -137,7 +144,35 @@ RUN pip install mysqlclient
 #  newspaper3k
 
 # Tensorflow GPU supported version
-RUN pip install https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-0.9.0-cp35-cp35m-linux_x86_64.whl
+RUN pip install https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-0.10.0rc0-cp35-cp35m-linux_x86_64.whl
+
+
+#---------------------------------
+#   Supervisord
+#---------------------------------
+# Install Supervisor.
+RUN \
+  apt-get update && \
+  apt-get install -y supervisor && \
+  rm -rf /var/lib/apt/lists/* && \
+  sed -i 's/^\(\[supervisord\]\)$/\1\nnodaemon=true/' /etc/supervisor/supervisord.conf
+
+# Define mountable directories.
+VOLUME ["/etc/supervisor/conf.d"]
+
+# ------------------------------------------------------------------------------
+# Security changes
+# - Determine runlevel and services at startup [BOOT-5180]
+RUN update-rc.d supervisor defaults
+
+# - Check the output of apt-cache policy manually to determine why output is empty [KRNL-5788]
+RUN apt-get update | apt-get upgrade -y
+
+# - Install a PAM module for password strength testing like pam_cracklib or pam_passwdqc [AUTH-9262]
+RUN apt-get install libpam-cracklib -y
+RUN ln -s /lib/x86_64-linux-gnu/security/pam_cracklib.so /lib/security
+
+
 
 #---------------------------------
 #   Enviroment
@@ -146,18 +181,18 @@ RUN pip install https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-0
 RUN echo "Asia/Taipei" > /etc/timezone 
 RUN dpkg-reconfigure -f noninteractive tzdata
 
-# Add runner script
-COPY files/runner.sh /runner.sh
-RUN chmod +x /runner.sh
-WORKDIR /root
+# conventions
 COPY files/bashrc .bashrc
 COPY files/vimrc .vimrc
 
+# setup supervisor apps & start supervisor
+COPY files/supervisor/* /etc/supervisor/conf.d/
+CMD ["supervisord", "-c", "/etc/supervisor/supervisord.conf"]
+
 ## Set the working directory
 WORKDIR /home/workspace
-#RUN mkdir /home/workspace/notebooks
-#VOLUME /Users/marsan/wordspace
 
 EXPOSE 8880:8900
+EXPOSE 80
+EXPOSE 443
 
-ENTRYPOINT ["/runner.sh"]

Diff for: files/bashrc

@@ -96,11 +96,14 @@ alias vi='vim'
 alias svi='vim'
 alias sget='apt-get install'
 alias psg='ps ax | grep'
-alias psga='psg "parse\|flow\|train\|maxminer\|_rtbminer\|_tnative\|ipython-notebook\|submit"'
+alias psga='psg "python"'
 alias python='python3'
 alias shup='stdbuf -o0 nohup'
 alias kget='wget -x --load-cookies ~/.ssh/cookies.txt -P data -nH --cut-dirs=5 '
 alias wat='watch tail -n 30 '
+bkill() {
+  sudo kill -9 `ps aux | grep "$1" | awk '{print $2}'`
+}
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert

Diff for: files/runner.sh

@@ -1,18 +1,24 @@
 #!/bin/bash
 set -e
 
-case "$1" in
-  "")
-    bash
-    ;;
-  ipynb)
-    cd '/home/workspace/notebooks'
-    ipython3 notebook --no-browser --ip='*' --matplotlib="inline"
-    ;;
-  *)
-    $@
-    ;;
-esac
+# start supervisor
+supervisord -c /etc/supervisor/supervisord.conf
+
+#cd '/home/workspace/notebooks'; ipython3 notebook --no-browser --ip='*' --matplotlib="inline";
+
+
+#case "$1" in
+#  "")
+#    bash
+#    ;;
+#  ipynb)
+#    cd '/home/workspace/notebooks'
+#    ipython3 notebook --no-browser --ip='*' --matplotlib="inline"
+#    ;;
+#  *)
+#    $@
+#    ;;
+#esac
 
 exit 0