From cc6210f5c8feb8999307a2e6a02e04509ade13f8 Mon Sep 17 00:00:00 2001
From: ruowen <caiym@schbrain.com>
Date: Wed, 12 Dec 2018 13:07:40 +0800
Subject: [PATCH] downgrade python to 3.6.7

Change-Id: I7e4c775436dd6f91d3d156327b5367b355703290
---
 ai-box/Dockerfile       | 5 +----
 ai-box/requirements.txt | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ai-box/Dockerfile b/ai-box/Dockerfile
index 55b77b1..456662d 100644
--- a/ai-box/Dockerfile
+++ b/ai-box/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM registry-vpc.cn-hangzhou.aliyuncs.com/schbrain/python:3.7.0
+FROM registry-vpc.cn-hangzhou.aliyuncs.com/schbrain/python:3.6.7
 MAINTAINER xt
 
 ENV PYTHONUNBUFFERED 1
@@ -25,7 +25,6 @@ ENV LIBRARY_PATH /usr/lib/gcc/x86_64-linux-gnu/8
 COPY sources.list /etc/apt/sources.list
 COPY requirements.txt ./
 COPY simsun.ttc /usr/local/fonts/
-COPY tensorflow-1.12.0-cp37-cp37m-linux_x86_64.whl ./
 RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 40976EAF437D05B5 \
     && apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32 \
     && apt-get update \
@@ -35,7 +34,6 @@ RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 40976EAF437D05B5 \
          r-base=3.5.1-* r-base-dev=3.5.1-* r-recommended=3.5.1-* \
     && pip install --no-cache-dir --trusted-host mirrors.aliyun.com \
          -i http://mirrors.aliyun.com/pypi/simple -r requirements.txt \
-    && pip install ./tensorflow-1.12.0-cp37-cp37m-linux_x86_64.whl \
     && echo 'options(repos = c(CRAN = "https://cloud.r-project.org/"))' >> /etc/R/Rprofile.site \
     && echo 'source("/etc/R/Rprofile.site")' >> /etc/littler.r \
     && ln -s /usr/lib/R/site-library/littler/examples/install.r /usr/local/bin/install.r \
@@ -45,7 +43,6 @@ RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 40976EAF437D05B5 \
     && install.r docopt \
     && install.r mirt \
     && install.r mirtCAT \
-    && rm ./tensorflow-1.12.0-cp37-cp37m-linux_x86_64.whl \
     && rm -rf /tmp/downloaded_packages/ /tmp/*.rds \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/ai-box/requirements.txt b/ai-box/requirements.txt
index 11d076e..ff8476a 100644
--- a/ai-box/requirements.txt
+++ b/ai-box/requirements.txt
@@ -27,6 +27,7 @@ vine==1.1.4
 xlrd==1.1.0
 scipy
 scikit-learn
+scikit-image==0.13.1
 matplotlib
 pandas
 numpy
@@ -39,4 +40,5 @@ oss2==2.5.0
 zbarlight==2.1
 imutils==0.5.1
 seaborn==0.8.1
+tensorflow==1.12.0
 keras==2.2.4
-- 
GitLab