perf: 离线镜像校验

README.md

@@ -51,10 +51,6 @@ $ ./jmsctl.sh tail
 [root@localhost config]# tree .
 .
 ├── config.txt       # 主配置文件
-├── core
-│   └── config.yml   # core yml 格式配置文件，可以留空，使用 config.txt 设置
-├── koko
-│   └── config.yml   # koko yml 格式配置文件，可以留空，使用 config.txt 设置
 ├── mysql
 │   └── my.cnf       # mysql 配置文件
 |── mariadb

compose/docker-compose-celery.yml

@@ -13,7 +13,6 @@ services:
     env_file:
       - ${CONFIG_FILE}
     volumes:
-      - ${CONFIG_DIR}/core/config.yml:/opt/jumpserver/config.yml
       - ${CONFIG_DIR}/certs:/opt/jumpserver/data/certs
       - ${VOLUME_DIR}/core/data:/opt/jumpserver/data
     healthcheck:

compose/docker-compose-init-db.yml

@@ -10,7 +10,6 @@ services:
     env_file:
       - ${CONFIG_FILE}
     volumes:
-      - ${CONFIG_DIR}/core/config.yml:/opt/jumpserver/config.yml
       - ${CONFIG_DIR}/certs:/opt/jumpserver/data/certs
       - ${VOLUME_DIR}/core/data:/opt/jumpserver/data
     networks:

scripts/utils.sh

@@ -651,13 +651,42 @@ function pull_image() {
   echo ""
 }
 
+function check_images() {
+  images_to=$(get_images)
+  failed=0
+
+  for image in ${images_to}; do
+    if ! docker image inspect -f '{{ .Id }}' "$image" &> /dev/null; then
+      pull_image "$image"
+    fi
+  done
+  for image in ${images_to}; do
+    if ! docker image inspect -f '{{ .Id }}' "$image" &> /dev/null; then
+      echo_red "$(gettext 'Failed to pull image') ${image}"
+      failed=1
+    fi
+  done
+
+  if [ $failed -eq 1 ]; then
+    exit 1
+  fi
+}
+
 function pull_images() {
   images_to=$(get_images)
+  pids=()
+
+  trap 'kill ${pids[*]}' SIGINT SIGTERM
 
   for image in ${images_to}; do
     pull_image "$image" &
+    pids+=($!)
   done
-  wait
+  wait ${pids[*]}
+
+  trap - SIGINT SIGTERM
+
+  check_images
 }
 
 function installation_log() {