Merge pull request #2570 from jumpserver/dev

Bugfix (#2569)

Dockerfile

@@ -6,11 +6,11 @@ RUN useradd jumpserver
 
 COPY ./requirements /tmp/requirements
 
-RUN rpm -ivh https://repo.mysql.com/mysql57-community-release-el6.rpm
-RUN yum -y install epel-release openldap-clients telnet && cd /tmp/requirements && \
-    yum -y install $(cat rpm_requirements.txt)
-
-RUN cd /tmp/requirements &&  pip install -i https://mirrors.aliyun.com/pypi/simple/ -r requirements.txt || pip install -r requirements.txt
+RUN yum -y install epel-release && rpm -ivh https://repo.mysql.com/mysql57-community-release-el6.rpm
+RUN cd /tmp/requirements && yum -y install $(cat rpm_requirements.txt)
+RUN cd /tmp/requirements && pip install --upgrade pip setuptools && \
+    pip install -i https://mirrors.aliyun.com/pypi/simple/ -r requirements.txt || pip install -r 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

apps/templates/_user_profile.html

@@ -3,7 +3,7 @@
 <li class="nav-header">
     <div class="profile-element" style="height: 65px">
         <div href="http://www.jumpserver.org" target="_blank" style="width: 100%; background-image: url({% static 'img/header-profile.png' %})">
-             <img alt="logo" height="55" width="185" src="{{ LOGO_TEXT_URL }}"/>
+             <img alt="logo" height="55" width="185" style="margin-right: 5px" src="{{ LOGO_TEXT_URL }}"/>
         </div>
     </div>
     <div class="logo-element">

requirements/rpm_requirements.txt

-libtiff-devel libjpeg-devel libzip-devel freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel sshpass openldap-devel mariadb-devel mysql-devel libffi-devel openssh-clients openldap-clients 
+libtiff-devel libjpeg-devel libzip-devel freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel sshpass openldap-devel mariadb-devel mysql-devel libffi-devel openssh-clients telnet openldap-clients