From c3cbc047b1af47029642c7e534b1390a416d1be3 Mon Sep 17 00:00:00 2001
From: yaziming <Shao.Jiang-DAJ@yumchina.com>
Date: Thu, 15 Aug 2019 11:49:17 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=20master=E9=95=9C=E5=83=8Fnginx?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Break change：
 Dockerfile.alpine -> Dockerfile.master.alpine

Feture:
  增加Dockerfile.worker.alpine 文件
---
 Dockerfile.apline => Dockerfile.master.apline |  6 +--
 Dockerfile.worker.apline                      | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)
 rename Dockerfile.apline => Dockerfile.master.apline (88%)
 create mode 100644 Dockerfile.worker.apline

diff --git a/Dockerfile.apline b/Dockerfile.master.apline
similarity index 88%
rename from Dockerfile.apline
rename to Dockerfile.master.apline
index 1a2dbf07..d6fc4ba2 100644
--- a/Dockerfile.apline
+++ b/Dockerfile.master.apline
@@ -27,10 +27,6 @@ ADD . /app
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 
 # install packages
-#RUN apt-get update \
-#	&& apt-get install -y curl git net-tools iputils-ping ntp ntpdate python3 python3-pip \
-#	&& ln -s /usr/bin/pip3 /usr/local/bin/pip \
-#	&& ln -s /usr/bin/python3 /usr/local/bin/python
 RUN apk update && apk add --no-cache --virtual .build-deps \
         gcc \
         linux-headers \
@@ -55,6 +51,8 @@ RUN apk del .build-deps
 COPY --from=frontend-build /app/dist /app/dist
 COPY --from=frontend-build /app/conf/crawlab.conf /etc/nginx/conf.d
 
+VOLUME [ “/sys/fs/cgroup” ]
+
 RUN sed -i 's/#rc_sys=""/rc_sys="lxc"/g' /etc/rc.conf && \
     echo 'rc_provide="loopback net"' >> /etc/rc.conf && \
     sed -i 's/^#\(rc_logger="YES"\)$/\1/' /etc/rc.conf && \
diff --git a/Dockerfile.worker.apline b/Dockerfile.worker.apline
new file mode 100644
index 00000000..e7a66776
--- /dev/null
+++ b/Dockerfile.worker.apline
@@ -0,0 +1,43 @@
+FROM golang:1.12-alpine AS backend-build
+
+WORKDIR /go/src/app
+COPY ./backend .
+
+ENV GO111MODULE on
+ENV GOPROXY https://mirrors.aliyun.com/goproxy/
+
+RUN go install -v ./...
+
+# images
+FROM python:alpine
+
+ADD . /app
+
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+
+RUN apk update && apk add --no-cache --virtual .build-deps \
+        gcc \
+        linux-headers \
+        musl-dev \
+        libffi-dev \
+        libxml2-dev \
+        libxslt-dev \
+        openssl-dev
+
+# install backend
+RUN pip install scrapy pymongo bs4 requests -i https://pypi.tuna.tsinghua.edu.cn/simple
+
+# copy backend files
+COPY --from=backend-build /go/src/app/conf ./conf
+COPY --from=backend-build /go/bin/crawlab /usr/local/bin
+
+RUN apk del .build-deps
+
+# working directory
+WORKDIR /app/backend
+
+# backend port
+EXPOSE 8000
+
+# start backend
+CMD crawlab
\ No newline at end of file