将不敏感的环境变量信息输出 (#3)

* 公共方法定义为外部方法

* 加入注释

* 加入注释

* 删除多余的输出

* 删除多余的输出

Author: jefferyjob

scripts/deploy.docker.sh

@@ -2,10 +2,19 @@
 # 确保脚本遇到错误时退出
 set -e
 
-echo "----------------------------------------------------------------------"
-echo "SERVER_IP: $SERVER_IP"
-echo "SERVER_USER: $SERVER_USER"
-echo "----------------------------------------------------------------------"
+print_env() {
+  echo "----------------------------------------------------------------------"
+  echo "  SERVER_IP: $SERVER_IP"
+  echo "  SERVER_USER: $SERVER_USER"
+  echo "----------------------------------------------------------------------"
+  echo "  DOCKER_REGISTRY_URL: $DOCKER_REGISTRY_URL"
+  echo "  DOCKER_IMAGE: $DOCKER_IMAGE"
+  echo "  CONTAINER_NAME: $CONTAINER_NAME"
+  echo "  DOCKER_APP_PARAMS: $DOCKER_APP_PARAMS"
+  echo "----------------------------------------------------------------------"
+}
+
+print_env
 
 # 启动 SSH 代理并添加私钥
 eval "$(ssh-agent -s)"
@@ -19,13 +28,6 @@ ssh-keyscan -H "$SERVER_IP" >> ~/.ssh/known_hosts
 ssh "$SERVER_USER"@"$SERVER_IP" <<EOF
   set -e
 
-  echo "----------------------------------------------------------------------"
-  echo "DOCKER_IMAGE: $DOCKER_IMAGE"
-  echo "CONTAINER_NAME: $CONTAINER_NAME"
-  echo "DOCKER_APP_PARAMS: $DOCKER_APP_PARAMS"
-  echo "----------------------------------------------------------------------"
-
-
   # 备份现有的容器和镜像
   HAS_BACKUP_IMAGE=false
   if sudo docker inspect $CONTAINER_NAME > /dev/null 2>&1; then

scripts/deploy.pwd.docker.sh

@@ -2,23 +2,25 @@
 # 确保脚本遇到错误时退出
 set -e
 
-echo "----------------------------------------------------------------------"
-echo "SERVER_IP: $SERVER_IP"
-echo "SERVER_USER: $SERVER_USER"
-echo "----------------------------------------------------------------------"
+print_env() {
+  echo "----------------------------------------------------------------------"
+  echo "  SERVER_IP: $SERVER_IP"
+  echo "  SERVER_USER: $SERVER_USER"
+  echo "----------------------------------------------------------------------"
+  echo "  DOCKER_REGISTRY_URL: $DOCKER_REGISTRY_URL"
+  echo "  DOCKER_IMAGE: $DOCKER_IMAGE"
+  echo "  CONTAINER_NAME: $CONTAINER_NAME"
+  echo "  DOCKER_APP_PARAMS: $DOCKER_APP_PARAMS"
+  echo "----------------------------------------------------------------------"
+}
+
+print_env
 
 # 部署Docker容器
 # shellcheck disable=SC2087
 sshpass -p "$SERVER_PWD" ssh -t -o StrictHostKeyChecking=no "$SERVER_USER"@"$SERVER_IP" <<EOF
   set -e
 
-  echo "----------------------------------------------------------------------"
-  echo "DOCKER_IMAGE: $DOCKER_IMAGE"
-  echo "CONTAINER_NAME: $CONTAINER_NAME"
-  echo "DOCKER_APP_PARAMS: $DOCKER_APP_PARAMS"
-  echo "----------------------------------------------------------------------"
-
-
   # 备份现有的容器和镜像
   HAS_BACKUP_IMAGE=false
   if sudo docker inspect $CONTAINER_NAME > /dev/null 2>&1; then