mirror of https://github.com/jumpserver/jumpserver
Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_remoteapp_view
commit
e006a1949e
|
@ -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
|
||||||
|
|
|
@ -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
6
jms
|
@ -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():
|
||||||
|
|
Loading…
Reference in New Issue