Merge pull request yutiansut#1382 from yutiansut/master

update
Mx1014 · Jan 4, 2020 · b24b485 · b24b485
2 parents 7702557 + e9ff124
commit b24b485
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/docker/qa-community-go-r/Dockerfile b/docker/qa-community-go-r/Dockerfile
@@ -5,9 +5,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN cd /root && git clone https://gitee.com/yutiansut/QADESK_BASIC && cd QADESK_BASIC \
 && pip install quantaxis-servicedetect \
-&& pip install quantaxis-pubsub\
-&& apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32  40976EAF437D05B5 \
-&& apt update
+&& pip install quantaxis-pubsub
+
 
 COPY run-community.sh /root/run-community.sh
 RUN chmod +x /opt/conda/lib/python3.7/site-packages/QUANTAXIS/QAUtil/QASetting.py\

diff --git a/docker/qa-community-r/Dockerfile b/docker/qa-community-r/Dockerfile
@@ -3,13 +3,18 @@ USER root
 ENV TZ=Asia/Shanghai
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN cd /root && git clone https://gitee.com/yutiansut/QADESK_BASIC && cd QADESK_BASIC \
-&& apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32  40976EAF437D05B5\
-&& apt update \
+RUN cd /root && git clone https://gitee.com/yutiansut/QADESK_BASIC && cd QADESK_BASIC
+
+RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32  40976EAF437D05B5\
+&& apt update 
+
+RUN apt install install -y gnupg2 \
 && pip install quantaxis-servicedetect \
 && pip install qifiaccount -U \
 && pip install QAStrategy -U \
-&& pip install quantaxis-pubsub
+&& pip install quantaxis-pubsub \
+&& pip install qgrid \
+&& pip install "dask[complete]"
 
 
 # RUN pip install qgrid\
@@ -18,7 +23,6 @@ RUN cd /root && git clone https://gitee.com/yutiansut/QADESK_BASIC && cd QADESK_
 # && jupyter labextension install @jupyter-widgets/jupyterlab-manager\
 # && jupyter labextension install qgrid
 
-RUN pip install qgrid && pip install "dask[complete]"
 
 COPY run-community.sh /root/run-community.sh
 RUN chmod +x /opt/conda/lib/python3.7/site-packages/QUANTAXIS/QAUtil/QASetting.py

diff --git a/docker/qa-jupyter-r/Dockerfile b/docker/qa-jupyter-r/Dockerfile
@@ -15,11 +15,11 @@ COPY requirements.txt /requirements.txt
 # COPY pip.conf /root/.pip/pip.conf
 COPY source.list /etc/apt/sources.list
 
-RUN \ 
-    && apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32  40976EAF437D05B5\
-    && apt-get update \
+RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32  40976EAF437D05B5\
+    && apt-get update
+
     # && apt-get install -y apt-utils locales\
-    && apt-get install gcc -y --force-yes\
+RUN apt-get install gcc -y --force-yes\
     && locale-gen zh_CN.UTF-8 \
     && localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 \
     && echo "LANG=zh_CN.UTF-8" > /etc/locale.conf \
@@ -28,7 +28,7 @@ RUN \
 
 RUN \
     cd ~ \
-    git clone https://github.com/QUANTAXIS/QUANTAXIS \
+    && git clone https://github.com/QUANTAXIS/QUANTAXIS \
     && cd QUANTAXIS \
     && pip install -r requirements.txt \
     && pip install quantaxis-servicedetect \