From 76876868858b598cbfe52763d3b55d67752140ec Mon Sep 17 00:00:00 2001
From: RichZDS <3388214266@qq.com>
Date: Wed, 4 Feb 2026 00:11:24 +0800
Subject: [PATCH] =?UTF-8?q?dockerfile=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile         | 28 ++--------------------------
 deploy.sh          | 36 ++++++++++++++++++++++++++++++++++++
 docker-compose.yml | 40 ++++++++++++++++++++++++++--------------
 3 files changed, 64 insertions(+), 40 deletions(-)
 create mode 100644 deploy.sh

diff --git a/Dockerfile b/Dockerfile
index fdbef40..891fcbc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,46 +2,22 @@
 FROM golang:1.24-alpine AS builder
 
 WORKDIR /app
+RUN apk add --no-cache gcc musl-dev  # 仅当需要 CGO 时才保留（你的代码可能不需要，但保留无害）
 
-# 安装编译依赖（仅用于 CGO，但你已禁用 CGO，其实可省略）
-# 如果确实不需要 CGO（如纯 Go 代码），可删除下一行以加速构建
-RUN apk add --no-cache gcc musl-dev
-
-# 复制模块文件并下载依赖
 COPY go.mod go.sum ./
 RUN go mod download
 
-# 复制源码
 COPY . .
-
-# 编译静态二进制（CGO_ENABLED=0 确保无动态链接）
 RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags="-s -w" -o server ./cmd/server/main.go
 
-
 # 第二阶段：运行
 FROM alpine:latest
-
-# 安全加固：创建非 root 用户
-RUN addgroup -g 1001 -S app && \
-    adduser -u 1001 -S app -G app
-
+RUN addgroup -g 1001 -S app && adduser -u 1001 -S app -G app
 WORKDIR /app
-
-# 从构建阶段复制二进制和静态资源
 COPY --from=builder /app/server .
 COPY --from=builder /app/web ./web
-
-# 更改文件所有者（安全最佳实践）
 RUN chown -R app:app /app
-
-# 切换到非 root 用户
 USER app
-
-# 暴露端口
 EXPOSE 2779
-
-# 设置默认端口（可通过 docker run -e PORT=... 覆盖）
 ENV PORT=2779
-
-# 启动应用
 CMD ["./server"]
\ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
new file mode 100644
index 0000000..8cf3c3d
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# ChatRoom 自动部署脚本
+# 用法: ./deploy.sh [镜像地址]
+# 示例: ./deploy.sh                    # 本地构建部署
+#       ./deploy.sh registry.cn-hangzhou.aliyuncs.com/xxx/chatroom:latest  # 从镜像仓库拉取部署
+
+set -e
+
+COMPOSE_FILE="docker-compose.yml"
+PORT=2779
+
+echo "=========================================="
+echo "  ChatRoom 部署脚本 - 端口 $PORT"
+echo "=========================================="
+
+if [ -n "$1" ]; then
+    # 从远程仓库拉取镜像并部署
+    export CHATROOM_IMAGE="$1"
+    echo ">>> 拉取镜像: $CHATROOM_IMAGE"
+    docker compose -f "$COMPOSE_FILE" pull app
+    echo ">>> 启动容器..."
+    docker compose -f "$COMPOSE_FILE" up -d --no-build
+else
+    # 本地构建并部署
+    echo ">>> 构建并启动..."
+    docker compose -f "$COMPOSE_FILE" up -d --build
+fi
+
+echo ""
+echo ">>> 部署完成!"
+echo "    服务地址: http://localhost:$PORT"
+echo "    WebSocket: ws://localhost:$PORT/ws"
+echo ""
+echo ">>> 查看日志: docker compose logs -f app"
+echo ">>> 停止服务: docker compose down"
+echo "=========================================="
diff --git a/docker-compose.yml b/docker-compose.yml
index eb3ad3f..fdc0829 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,28 +1,40 @@
+version: '3.8'
+
 services:
   app:
-    build: .
-    # 生产环境可设置 CHATROOM_IMAGE 从镜像仓库拉取，如: registry.cn-hangzhou.aliyuncs.com/xxx/chatroom:latest
-    image: ${CHATROOM_IMAGE:-chatroom:latest}
+    image: zhengdushi/chatroom:latest  # 直接使用你推送的镜像
     container_name: chatroom-app
-    labels:
-      - "com.centurylinklabs.watchtower.enable=true"  # Watchtower 监控此容器
     ports:
       - "2779:2779"
     environment:
-      - RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672/
       - PORT=2779
+      - RABBITMQ_HOST=rabbitmq
+      - RABBITMQ_USER=admin
+      - RABBITMQ_PASS=1218Zhengyaqi  # ← 请务必修改为你的密码！
     depends_on:
-      rabbitmq:
-        condition: service_healthy
+      - rabbitmq
+    restart: unless-stopped
+    networks:
+      - chatroom-net
 
   rabbitmq:
-    image: rabbitmq:3-management
+    image: rabbitmq:3-management-alpine
     container_name: chatroom-rabbitmq
     ports:
       - "5672:5672"
       - "15672:15672"
-    healthcheck:
-      test: ["CMD", "rabbitmq-diagnostics", "-q", "check_running"]
-      interval: 5s
-      timeout: 15s
-      retries: 5
+    environment:
+      RABBITMQ_DEFAULT_USER: admin
+      RABBITMQ_DEFAULT_PASS: 1218Zhengyaqi  # ← 必须和上面一致！
+    volumes:
+      - rabbitmq_data:/var/lib/rabbitmq
+    restart: unless-stopped
+    networks:
+      - chatroom-net
+
+networks:
+  chatroom-net:
+    driver: bridge
+
+volumes:
+  rabbitmq_data:
\ No newline at end of file