From 8fff57813ac6eac7383681225eda0389e6966fd6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 15 Oct 2020 13:50:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?perf(Dockerfile):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9E=84=E5=BB=BAdocker,=E7=BB=8F=E5=B8=B8=E5=8F=98=E5=8A=A8?= =?UTF-8?q?=E7=9A=84=E5=8C=85=E4=B8=8D=E4=BD=BF=E7=94=A8=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9c0cd9dbf..8ab6d6a1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,7 @@ RUN yum -y install epel-release && \ RUN yum -y install $(cat requirements/rpm_requirements.txt) RUN pip install --upgrade pip setuptools==49.6.0 wheel -i ${PIP_MIRROR} && \ pip config set global.index-url ${PIP_MIRROR} +RUN pip install $(grep 'jms' requirements/requirements.txt) -i https://pypi.org/simple RUN pip install -r requirements/requirements.txt || pip install -r requirements/requirements.txt COPY --from=stage-build /opt/jumpserver/release/jumpserver /opt/jumpserver From 8943850ca9da5f291b03115c4af9e2838f0e7268 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Thu, 15 Oct 2020 14:05:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?perf(Dockerfile):=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E4=BB=A3=E7=A0=81=20(#4801)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf(Dockerfile): 优化构建docker,经常变动的包不使用镜像 Co-authored-by: ibuler --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ab6d6a1d..b030c25b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN yum -y install $(cat requirements/rpm_requirements.txt) RUN pip install --upgrade pip setuptools==49.6.0 wheel -i ${PIP_MIRROR} && \ pip config set global.index-url ${PIP_MIRROR} RUN pip install $(grep 'jms' requirements/requirements.txt) -i https://pypi.org/simple -RUN pip install -r requirements/requirements.txt || pip install -r requirements/requirements.txt +RUN pip install -r requirements/requirements.txt COPY --from=stage-build /opt/jumpserver/release/jumpserver /opt/jumpserver RUN mkdir -p /root/.ssh/ && echo -e "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile /dev/null" > /root/.ssh/config