diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 30a0036..701f5ee 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -39,6 +39,7 @@ jobs: # 停止容器并删除同名镜像 # --rmi local: 删除服务构建的镜像 echo "123quant-speed" | sudo -S docker compose down --rmi local + echo "123quant-speed" | sudo -S docker rmi epaper_server:latest || true # 启动服务 - echo "123quant-speed" | sudo -S docker compose up -d + echo "123quant-speed" | sudo -S docker compose up -d --build diff --git a/docker-compose.yml b/docker-compose.yml index c2de82e..c6bb58c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,11 @@ services: # 主应用服务 - luna-app: + epaper_server: + image: epaper_server:latest build: context: . dockerfile: Dockerfile - container_name: luna-app + container_name: epaper_server ports: - "8199:8199" volumes: diff --git a/docker_deplay.sh b/docker_deplay.sh index fe0d41f..98bdb1d 100755 --- a/docker_deplay.sh +++ b/docker_deplay.sh @@ -17,9 +17,9 @@ SERVER_HOST="6.6.6.66" # 服务器IP地址 SERVER_USER="ubuntu" # 服务器用户名 SERVER_PASSWORD="qweasdzxc1" # 服务器密码 SERVER_PORT="22" # SSH端口,默认22 -IMAGE_NAME="epage_server" # Docker镜像名称 +IMAGE_NAME="epaper_server" # Docker镜像名称 IMAGE_TAG="latest" # Docker镜像标签 -CONTAINER_NAME="epage_server-container" # 容器名称 +CONTAINER_NAME="epaper_server-container" # 容器名称 LOCAL_PORT="8199" # 本地端口 CONTAINER_PORT="8199" # 容器端口 TAR_FILE="${IMAGE_NAME}-${IMAGE_TAG}.tar" # 压缩包文件名