diff --git a/.gitignore b/.gitignore index 9be43b8..ab59a67 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ *.csv .* +venv/ test/ data/ build/ diff --git a/Docker/Dockerfile b/Docker/Dockerfile index c065937..56b7859 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -4,17 +4,17 @@ # docker run -it --name test [-p -v] user/centos:v6.10.3 # docker attach test # centos7: -# docker build -t user/centos:v7.0.1 . +# docker build -t user/centos:v7.8.1 . # docker run -dt --privileged --name test [-p -v] user/centos:v7.0.1 # docker exec -it test /bin/bash -# FROM centos:7 -FROM centos:6.10 +FROM centos:7.8.2003 +# FROM centos:6.10 MAINTAINER xianhu # change system environments -ENV LANG en_US.UTF-8 -ENV LC_ALL en_US.UTF-8 +ENV LANG "en_US.UTF-8" +ENV LC_ALL "en_US.UTF-8" # change system local time RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime @@ -30,6 +30,7 @@ RUN yum install -y git RUN yum install -y gcc RUN yum install -y make RUN yum install -y wget +RUN yum install -y which RUN yum install -y screen RUN yum install -y gcc-c++ RUN yum install -y crontabs @@ -37,18 +38,21 @@ RUN yum install -y zlib-devel RUN yum install -y sqlite-devel RUN yum install -y openssl-devel RUN yum install -y libSM.x86_64 -RUN yum install -y libXrender.x86_64 RUN yum install -y libXext.x86_64 +RUN yum install -y libXrender.x86_64 + +# install node +RUN curl -sL https://rpm.nodesource.com/setup_14.x | bash - +RUN yum install -y nodejs + +# install epel +RUN yum install -y epel-release # install python -RUN yum install -y https://centos6.iuscommunity.org/ius-release.rpm -# RUN yum install -y https://centos7.iuscommunity.org/ius-release.rpm -RUN yum install -y python36u -RUN yum install -y python36u-pip -RUN yum install -y python36u-devel +RUN yum install -y python36 +RUN yum install -y python36-devel # install nginx -RUN yum install -y epel-release RUN yum install -y nginx # clean yum cache @@ -57,11 +61,8 @@ RUN yum clean all # install libs of python3 ADD ./requirements.txt /root/ WORKDIR /root/ -# RUN pip3.6 install --upgrade pip -# RUN pip3.6 install -r requirements.txt +# RUN pip3.6 install --upgrade pip -i http://pypi.douban.com/simple/ +# RUN pip3.6 install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ -# centos6 +# entry CMD /bin/bash - -# centos7 -# ENTRYPOINT /usr/sbin/init