Merge remote-tracking branch 'origin/develop' into develop

.dockerignore

@@ -0,0 +1,4 @@
+.idea
+logs
+*.log
+**/node_modules

Dockerfile

@@ -0,0 +1,58 @@
+# images
+FROM ubuntu:latest
+
+# set as non-interactive
+ENV DEBIAN_FRONTEND noninteractive
+
+# source files
+ADD . /opt/crawlab
+
+# install python
+RUN apt-get update
+RUN apt-get install -y python3 python3-pip net-tools iputils-ping redis-server git nginx ntp curl
+
+# python soft link
+RUN ln -s /usr/bin/pip3 /usr/local/bin/pip
+RUN ln -s /usr/bin/python3 /usr/local/bin/python
+
+# install mongodb
+RUN echo "Asia/Shanghai" > /etc/timezone && dpkg-reconfigure -f noninteractive tzdata
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
+RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list
+RUN apt-get update
+RUN apt-get install -y mongodb-org
+
+# install backend
+RUN pip install -U setuptools
+RUN pip install -r /opt/crawlab/crawlab/requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
+
+# install nvm
+#RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
+#RUN export NVM_DIR="$HOME/.nvm"
+#RUN [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+#RUN nvm install 8.12
+#RUN nvm use 8.12
+
+# install frontend
+WORKDIR /opt/crawlab/frontend
+#RUN npm install -g yarn pm2
+#RUN yarn install
+
+# nginx config & start frontend
+RUN cp /opt/crawlab/crawlab.conf /etc/nginx/conf.d
+RUN service nginx reload
+
+# start backend
+WORKDIR /opt/crawlab/crawlab
+CMD python app.py 
+CMD python flower.py 
+CMD python worker.py 
+#CMD pm2 start app.py
+#CMD pm2 start flower.py
+#CMD pm2 start worker.py
+
+# start mongodb
+CMD mongod
+
+# start redis
+CMD redis-server

crawlab.conf

@@ -0,0 +1,5 @@
+server {
+	listen 	8080;
+	root	/opt/crawlab/frontend/dist;	
+	index	index.html;
+}

crawlab/Dockerfile

@@ -1,26 +0,0 @@
-# images
-#FROM python:latest
-FROM ubuntu:latest
-
-# source files
-ADD . /opt/crawlab
-
-# add dns
-RUN cat /etc/resolv.conf
-
-# install python
-RUN apt-get update
-RUN apt-get install -y python3 python3-pip net-tools iputils-ping vim ntp
-
-# soft link
-RUN ln -s /usr/bin/pip3 /usr/local/bin/pip
-RUN ln -s /usr/bin/python3 /usr/local/bin/python
-
-# install required libraries
-RUN pip install -U setuptools
-RUN pip install -r /opt/crawlab/requirements.txt
-
-# execute apps
-WORKDIR /opt/crawlab
-CMD python ./bin/run_worker.py
-CMD python app.py