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                        \
 | 
			
		||||
        unzip                         \
 | 
			
		||||
        vim                           \
 | 
			
		||||
        git                           \
 | 
			
		||||
        wget"
 | 
			
		||||
 | 
			
		||||
ARG APT_MIRROR=http://mirrors.ustc.edu.cn
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,6 +41,7 @@ ARG TOOLS="                           \
 | 
			
		|||
        telnet                        \
 | 
			
		||||
        unzip                         \
 | 
			
		||||
        vim                           \
 | 
			
		||||
        git                           \
 | 
			
		||||
        wget"
 | 
			
		||||
 | 
			
		||||
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():
 | 
			
		||||
    logging.info("Install builtin applets")
 | 
			
		||||
    try:
 | 
			
		||||
        management.call_command('install_builtin_applets', verbosity=0, interactive=False)
 | 
			
		||||
    except:
 | 
			
		||||
        pass
 | 
			
		||||
        management.call_command('install_builtin_applets', verbosity=0)
 | 
			
		||||
    except Exception as e:
 | 
			
		||||
        logging.error("Install builtin applets err: {}".format(e))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def upgrade_db():
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue