From ea913a5b6e81190a7e6b7d36f7c4af77e242eded Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 9 Jul 2020 17:03:49 +0800
Subject: [PATCH] =?UTF-8?q?ci(build):=20=E4=BF=AE=E6=94=B9=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile     | 23 ++++++++++++++++-------
 utils/build.sh | 14 +++++++++-----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6569db2a3..869955f17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,28 @@
-FROM registry.fit2cloud.com/public/python:v3
+FROM registry.fit2cloud.com/public/python:v3 as stage-build
 MAINTAINER Jumpserver Team <ibuler@qq.com>
+ARG VERSION
+ENV VERSION=$VERSION
 
 WORKDIR /opt/jumpserver
-RUN useradd jumpserver
+ADD . .
+RUN cd utils && bash -ixeu build.sh
 
-COPY ./requirements /tmp/requirements
+
+FROM registry.fit2cloud.com/public/python:v3
+WORKDIR /opt/jumpserver
+COPY --from=stage-build /opt/jumpserver/release/jumpserver /opt/jumpserver
+
+RUN useradd jumpserver
 
 RUN yum -y install epel-release && \
       echo -e "[mysql]\nname=mysql\nbaseurl=https://mirrors.tuna.tsinghua.edu.cn/mysql/yum/mysql57-community-el6/\ngpgcheck=0\nenabled=1" > /etc/yum.repos.d/mysql.repo
-RUN cd /tmp/requirements && yum -y install $(cat rpm_requirements.txt)
-RUN cd /tmp/requirements && pip install --upgrade pip setuptools && pip install wheel && \
-    pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt || pip install -r requirements.txt
+
+COPY . .
+RUN yum -y install $(cat requirements/rpm_requirements.txt)
+RUN pip install --upgrade pip setuptools && pip install wheel && \
+    pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements/requirements.txt || pip install -r requirements/requirements.txt
 RUN mkdir -p /root/.ssh/ && echo -e "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile /dev/null" > /root/.ssh/config
 
-COPY . /opt/jumpserver
 RUN echo > config.yml
 VOLUME /opt/jumpserver/data
 VOLUME /opt/jumpserver/logs
diff --git a/utils/build.sh b/utils/build.sh
index 1cf6e9de8..4d23aa66b 100755
--- a/utils/build.sh
+++ b/utils/build.sh
@@ -5,15 +5,19 @@ utils_dir=$(pwd)
 project_dir=$(dirname "$utils_dir")
 release_dir=${project_dir}/release
 
-# 安装依赖包
-command -v git || yum -y install git
-
 # 打包
 cd "${project_dir}" || exit 3
-rm -rf "${release_dir:?}/*"
+rm -rf "${release_dir:?}"/*
 to_dir="${release_dir}/jumpserver"
 mkdir -p "${to_dir}"
-git archive --format tar HEAD | tar x -C "${to_dir}"
+
+if [[ -d '.git' ]];then
+  command -v git || yum -y install git
+  git archive --format tar HEAD | tar x -C "${to_dir}"
+else
+  cp -R . /tmp/jumpserver
+  mv -R /tmp/jumpserver/* "${to_dir}"
+fi
 
 if [[ $(uname) == 'Darwin' ]];then
   alias sedi="sed -i ''"