diff --git a/.gitignore b/.gitignore index 9c125bfe3..ecbb47960 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,4 @@ logs/* .vagrant/ release/* releashe -django.mo /apps/script.py diff --git a/Dockerfile b/Dockerfile index 554bbb0dc..cf70c1d19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,10 +41,7 @@ RUN mkdir -p /opt/jumpserver/oracle/ \ && ldconfig \ && rm -f instantclient-basiclite-linux.x64-21.1.0.0.0.tar -RUN echo 'SECRET_KEY: BUILD' > config.yml \ - && cd apps \ - && python manage.py compilemessages \ - && echo > ../config.yml +RUN echo > config.yml VOLUME /opt/jumpserver/data VOLUME /opt/jumpserver/logs diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo new file mode 100644 index 000000000..b64789e68 --- /dev/null +++ b/apps/locale/zh/LC_MESSAGES/django.mo @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76a9ccd646b5f8a18196e52a277e7af8319fdb155193b310ed6c1769e45a1ffd +size 97641 diff --git a/requirements/deb_requirements.txt b/requirements/deb_requirements.txt index bd3dd8242..6edb70062 100644 --- a/requirements/deb_requirements.txt +++ b/requirements/deb_requirements.txt @@ -1 +1 @@ -g++ make iputils-ping default-libmysqlclient-dev libpq-dev libffi-dev libldap2-dev libsasl2-dev sshpass gettext +g++ make iputils-ping default-libmysqlclient-dev libpq-dev libffi-dev libldap2-dev libsasl2-dev sshpass diff --git a/requirements/mac_requirements.sh b/requirements/mac_requirements.sh new file mode 100644 index 000000000..66f28d130 --- /dev/null +++ b/requirements/mac_requirements.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +echo "安装依赖" +brew install libtiff libjpeg webp little-cms2 openssl gettext git git-lfs mysql + +echo "安装依赖的插件" +git lfs install diff --git a/requirements/mac_requirements.txt b/requirements/mac_requirements.txt deleted file mode 100644 index bc81ef5bd..000000000 --- a/requirements/mac_requirements.txt +++ /dev/null @@ -1 +0,0 @@ -brew install libtiff libjpeg webp little-cms2 openssl gettext diff --git a/requirements/rpm_requirements.txt b/requirements/rpm_requirements.txt index e84966386..a11e46125 100644 --- a/requirements/rpm_requirements.txt +++ b/requirements/rpm_requirements.txt @@ -1 +1 @@ -gcc-c++ sshpass mariadb-devel openldap-devel gettext +gcc-c++ sshpass mariadb-devel openldap-devel