Unverified Commit 6c1dcebb authored by 老广's avatar 老广 Committed by GitHub

Merge pull request #254 from jumpserver/dev

Dev
parents 47fc4b67 e8cc3d4e
...@@ -6,6 +6,7 @@ WORKDIR /opt/coco ...@@ -6,6 +6,7 @@ WORKDIR /opt/coco
RUN yum -y install epel-release RUN yum -y install epel-release
RUN cd requirements && yum -y install $(cat rpm_requirements.txt) RUN cd requirements && yum -y install $(cat rpm_requirements.txt)
RUN cd requirements && pip install $(egrep "jms|jumpserver" requirements.txt)
RUN cd requirements && pip install -r requirements.txt -i https://mirrors.aliyun.com/pypi/simple/ || pip install -r requirements.txt RUN cd requirements && pip install -r requirements.txt -i https://mirrors.aliyun.com/pypi/simple/ || pip install -r requirements.txt
ENV LANG=zh_CN.UTF-8 ENV LANG=zh_CN.UTF-8
...@@ -14,7 +15,7 @@ ENV LC_ALL=zh_CN.UTF-8 ...@@ -14,7 +15,7 @@ ENV LC_ALL=zh_CN.UTF-8
COPY . /opt/coco COPY . /opt/coco
VOLUME /opt/coco/data VOLUME /opt/coco/data
RUN echo > config.yml RUN echo > config.yml
EXPOSE 2222 EXPOSE 2222
ENTRYPOINT ["./entrypoint.sh"] ENTRYPOINT ["./entrypoint.sh"]
...@@ -19,7 +19,7 @@ itsdangerous==0.24 ...@@ -19,7 +19,7 @@ itsdangerous==0.24
Jinja2==2.10.1 Jinja2==2.10.1
jmespath==0.9.3 jmespath==0.9.3
jms-storage==0.0.23 jms-storage==0.0.23
jumpserver-python-sdk==0.0.70 jumpserver-python-sdk==0.0.71
MarkupSafe==1.0 MarkupSafe==1.0
oss2==2.4.0 oss2==2.4.0
paramiko==2.4.2 paramiko==2.4.2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment