From 48760f9fea2b18b7f437a4a68b856308420768ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E5=9D=A1?= Date: Sun, 27 Oct 2019 22:23:26 +0800 Subject: [PATCH] =?UTF-8?q?U=20-=20=E6=9B=B4=E6=96=B0=20dockerfile?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=BD=AF=E4=BB=B6=E5=8C=85=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/Dockerfile/Dockerfile | 4 ++-- spug_api/requirements.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/Dockerfile/Dockerfile b/docs/Dockerfile/Dockerfile index b96a099..c46cefc 100644 --- a/docs/Dockerfile/Dockerfile +++ b/docs/Dockerfile/Dockerfile @@ -3,7 +3,7 @@ ENV VERSION=1.0.5 RUN echo -e "http://mirrors.aliyun.com/alpine/v3.10/main\nhttp://mirrors.aliyun.com/alpine/v3.10/community" > /etc/apk/repositories RUN apk update && apk add --no-cache nginx mariadb nodejs-npm git -RUN apk add --no-cache --virtual .build-deps openssl-dev gcc musl-dev python3-dev libffi-dev openssl-dev make +RUN apk add --no-cache --virtual .build-deps openssl-dev gcc musl-dev python3-dev libffi-dev openssl-dev make openldap-dev RUN echo $VERSION && git clone https://github.com/openspug/spug.git --depth=1 /spug && cd /spug && git pull RUN pip config set global.index-url https://mirrors.aliyun.com/pypi/simple/ && pip install --upgrade pip && pip install --no-cache-dir -r /spug/spug_api/requirements.txt \ @@ -17,4 +17,4 @@ ADD default.conf /etc/nginx/conf.d/default.conf ADD entrypoint.sh /entrypoint.sh ADD scripts /scripts -ENTRYPOINT ["sh", "/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["sh", "/entrypoint.sh"] diff --git a/spug_api/requirements.txt b/spug_api/requirements.txt index cfc6d04..e3bfab2 100644 --- a/spug_api/requirements.txt +++ b/spug_api/requirements.txt @@ -42,3 +42,4 @@ urllib3==1.24.3 websocket-client==0.56.0 Werkzeug==0.16.0 python-ldap==3.2.0 +flask_simpleldap==1.4.0