Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_remoteapp_view

pull/9341/head
jiangweidong 2023-01-20 17:52:59 +08:00
commit e006a1949e
3 changed files with 5 additions and 3 deletions

View File

@ -41,6 +41,7 @@ ARG TOOLS=" \
telnet \ telnet \
unzip \ unzip \
vim \ vim \
git \
wget" wget"
ARG APT_MIRROR=http://mirrors.ustc.edu.cn ARG APT_MIRROR=http://mirrors.ustc.edu.cn

View File

@ -41,6 +41,7 @@ ARG TOOLS=" \
telnet \ telnet \
unzip \ unzip \
vim \ vim \
git \
wget" wget"
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \

6
jms
View File

@ -126,9 +126,9 @@ def download_ip_db():
def install_builtin_applets(): def install_builtin_applets():
logging.info("Install builtin applets") logging.info("Install builtin applets")
try: try:
management.call_command('install_builtin_applets', verbosity=0, interactive=False) management.call_command('install_builtin_applets', verbosity=0)
except: except Exception as e:
pass logging.error("Install builtin applets err: {}".format(e))
def upgrade_db(): def upgrade_db():