diff --git a/backend/deploy-all.sh b/backend/deploy-all.sh index 387ce72..c8e9f11 100755 --- a/backend/deploy-all.sh +++ b/backend/deploy-all.sh @@ -237,8 +237,15 @@ deploy_service() { # 构建Docker镜像 log_info "构建Docker镜像: $service_name" ssh 'root@47.111.10.27' " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${service_name}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 cd $REMOTE_DOCKER_COMPOSE_DIR docker build -t ${PROJECT_NAME}/${service_name}:latest -f Dockerfile.${service_name} . + + # 清理临时文件 + rm -f ${service_name}-1.0.0.jar " # 启动新容器 @@ -317,8 +324,8 @@ WORKDIR /app # 安装必要的工具 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -# 复制jar包 -COPY $REMOTE_BUILD_DIR/${service_name}-1.0.0.jar app.jar +# 复制jar包 (使用相对路径) +COPY ${service_name}-1.0.0.jar app.jar # 创建日志目录 RUN mkdir -p /app/logs diff --git a/backend/deploy-remote.sh b/backend/deploy-remote.sh index fef06eb..f404fbf 100755 --- a/backend/deploy-remote.sh +++ b/backend/deploy-remote.sh @@ -202,8 +202,15 @@ deploy_service_to_remote() { # 构建Docker镜像 log_info "构建Docker镜像: $service_name" ssh 'root@47.111.10.27' " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${service_name}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 cd $REMOTE_DOCKER_COMPOSE_DIR docker build -t ${PROJECT_NAME}/${service_name}:latest -f Dockerfile.${service_name} . + + # 清理临时文件 + rm -f ${service_name}-1.0.0.jar " # 启动新容器 @@ -279,7 +286,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${service_name}-1.0.0.jar app.jar +COPY ${service_name}-1.0.0.jar app.jar RUN mkdir -p /app/logs diff --git a/backend/emotion-ai/deploy.sh b/backend/emotion-ai/deploy.sh index 47491b6..4646715 100755 --- a/backend/emotion-ai/deploy.sh +++ b/backend/emotion-ai/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器" diff --git a/backend/emotion-auth/deploy.sh b/backend/emotion-auth/deploy.sh index 17c003c..61b0667 100755 --- a/backend/emotion-auth/deploy.sh +++ b/backend/emotion-auth/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器" diff --git a/backend/emotion-explore/deploy.sh b/backend/emotion-explore/deploy.sh index 37352a9..2b96202 100755 --- a/backend/emotion-explore/deploy.sh +++ b/backend/emotion-explore/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器" diff --git a/backend/emotion-gateway/deploy.sh b/backend/emotion-gateway/deploy.sh index b28d24b..2463116 100755 --- a/backend/emotion-gateway/deploy.sh +++ b/backend/emotion-gateway/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器" diff --git a/backend/emotion-growth/deploy.sh b/backend/emotion-growth/deploy.sh index 8fbadeb..d6a7f46 100755 --- a/backend/emotion-growth/deploy.sh +++ b/backend/emotion-growth/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器" diff --git a/backend/emotion-record/deploy.sh b/backend/emotion-record/deploy.sh index 963e97a..af4bc0a 100755 --- a/backend/emotion-record/deploy.sh +++ b/backend/emotion-record/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器" diff --git a/backend/emotion-reward/deploy.sh b/backend/emotion-reward/deploy.sh index f1ab3ca..9a91418 100755 --- a/backend/emotion-reward/deploy.sh +++ b/backend/emotion-reward/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器" diff --git a/backend/emotion-stats/deploy.sh b/backend/emotion-stats/deploy.sh index 9b64c0c..3df2637 100755 --- a/backend/emotion-stats/deploy.sh +++ b/backend/emotion-stats/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器" diff --git a/backend/emotion-user/deploy.sh b/backend/emotion-user/deploy.sh index 1b30423..2561138 100755 --- a/backend/emotion-user/deploy.sh +++ b/backend/emotion-user/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器" diff --git a/backend/emotion-websocket/deploy.sh b/backend/emotion-websocket/deploy.sh index 077e887..0ddd09d 100755 --- a/backend/emotion-websocket/deploy.sh +++ b/backend/emotion-websocket/deploy.sh @@ -79,7 +79,7 @@ WORKDIR /app RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/* -COPY $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar app.jar +COPY ${SERVICE_NAME}-1.0.0.jar app.jar RUN mkdir -p /app/logs @@ -144,8 +144,13 @@ deploy_service() { log_info "构建Docker镜像" ssh 'root@47.111.10.27' " cd $REMOTE_DOCKER_COMPOSE_DIR - docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . - " + # 复制jar包到Docker构建目录 + cp $REMOTE_BUILD_DIR/${SERVICE_NAME}-1.0.0.jar $REMOTE_DOCKER_COMPOSE_DIR/ + + # 构建镜像 docker build -t ${PROJECT_NAME}/${SERVICE_NAME}:latest -f Dockerfile.${SERVICE_NAME} . + + # 清理临时文件 + rm -f ${SERVICE_NAME}-1.0.0.jar " # 启动容器 log_info "启动新容器"