he2802 3 rokov pred
rodič
commit
419bedb2be
1 zmenil súbory, kde vykonal 0 pridanie a 4 odobranie
  1. 0 4
      run-dev.sh

+ 0 - 4
run-dev.sh

@@ -60,11 +60,7 @@ docker run \
 -e 'spring.profiles.active'=${profile_active} \
 -e TZ="Asia/Shanghai" \
 -v /etc/localtime:/etc/localtime \
-<<<<<<< HEAD
--v /usr/local/temp/fonts:/usr/share/fonts \
-=======
 -v /usr/share/fonts:/usr/share/fonts \
->>>>>>> pre
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'