From 9b10835b6173d5a272e6cd82f538eea4d05a6586 Mon Sep 17 00:00:00 2001
From: awei <awei@163.com>
Date: Tue, 4 Mar 2025 00:22:36 +0800
Subject: [PATCH] bbsgo activego

---
 bbs-go-active/Dockerfile                | 26 ++++++++++++------------
 bbs-go-active/docker-compose.yml        | 19 +++++++++--------
 bbs-go-active/server/bbs-go.docker.yaml |  2 +-
 bbs-go-active/site/.env.docker          |  2 +-
 bbs-go/Dockerfile                       | 27 ++++++++++++-------------
 bbs-go/docker-compose.yml               |  4 ++--
 bbs-go/server/bbs-go.docker.yaml        |  2 +-
 7 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/bbs-go-active/Dockerfile b/bbs-go-active/Dockerfile
index 08ce14c..f305ecd 100644
--- a/bbs-go-active/Dockerfile
+++ b/bbs-go-active/Dockerfile
@@ -1,45 +1,45 @@
 # server builder
 
-FROM golang:1.24 AS server_builder
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/library/golang:1.24 AS server_builder
 
 ENV APP_HOME=/code/bbs-go/server
 WORKDIR "$APP_HOME"
 
 COPY ./server ./
-# RUN go env -w GOPROXY=https://goproxy.cn,direct
+RUN go env -w GOPROXY=https://goproxy.cn,direct
 RUN go mod download
 RUN CGO_ENABLED=0 go build -v -o bbs-go main.go && chmod +x bbs-go
 
 
 # site builder
-FROM node:20-alpine AS site_builder
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/node:20.18.0-alpine AS site_builder
 
 ENV APP_HOME=/code/bbs-go/site
 WORKDIR "$APP_HOME"
 
 COPY ./site ./
-# RUN npm install -g pnpm --registry=https://registry.npmmirror.com
-# RUN pnpm install --registry=https://registry.npmmirror.com
-RUN npm install -g pnpm
-RUN pnpm install
+RUN npm install -g pnpm --registry=https://registry.npmmirror.com
+RUN pnpm install --registry=https://registry.npmmirror.com
+# RUN npm install -g pnpm
+# RUN pnpm install
 RUN pnpm build:docker
 
 
 # admin builder
-FROM node:20-alpine AS admin_builder
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/node:20.18.0-alpine AS admin_builder
 
 ENV APP_HOME=/code/bbs-go/admin
 WORKDIR "$APP_HOME"
 
 COPY ./admin ./
-# RUN npm install -g pnpm --registry=https://registry.npmmirror.com
-# RUN pnpm install --registry=https://registry.npmmirror.com
-RUN npm install -g pnpm
-RUN pnpm install
+RUN npm install -g pnpm --registry=https://registry.npmmirror.com
+RUN pnpm install --registry=https://registry.npmmirror.com
+# RUN npm install -g pnpm
+# RUN pnpm install
 RUN pnpm build:docker
 
 # run
-FROM node:20-alpine
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/node:20.18.0-alpine
 
 ENV APP_HOME=/app/bbs-go
 WORKDIR "$APP_HOME"
diff --git a/bbs-go-active/docker-compose.yml b/bbs-go-active/docker-compose.yml
index 0a2db83..82d4741 100644
--- a/bbs-go-active/docker-compose.yml
+++ b/bbs-go-active/docker-compose.yml
@@ -3,8 +3,8 @@ networks:
     driver: bridge
 services:
   mysql:
-    container_name: bbs-go-mysql
-    image: 'mysql:8.0'
+    container_name: bbs-go-mysql-active
+    image: 'swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/mysql:8.0.41'
     environment:
       TZ: Asia/Shanghai
       MYSQL_DATABASE: bbsgo_db
@@ -23,8 +23,8 @@ services:
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
 
   bbsgo:
-    container_name: bbs-go
-    image: mlogclub/bbs-go:4.0.3
+    container_name: bbs-go-active
+    # image: mlogclub/bbs-go:4.0.3
     depends_on:
       mysql:
         condition: service_healthy
@@ -32,11 +32,14 @@ services:
       dockerfile: Dockerfile
       context: ./
     volumes:
-      - /data/docker:/data
+      - /data/docker-active:/data
     environment:
       BBSGO_ENV: docker
-      BBSGO_DB_URL: root:123456@tcp(bbs-go-mysql:3306)/bbsgo_db?charset=utf8mb4&parseTime=True&multiStatements=true&loc=Local
-      BBSGO_BASEURL: 
+      BBSGO_DB_URL: root:123456@tcp(bbs-go-mysql-active:3306)/bbsgo_db?charset=utf8mb4&parseTime=True&multiStatements=true&loc=Local
+      BBSGO_BASEURL: https://active.deepseak.icu
+      BBSGO_API_URL: http://bbs-go-active:8082  # Add API endpoint
+      NUXT_PUBLIC_API_BASE: http://bbs-go-active:8082  # Nuxt runtime config
     ports:     
-      - 3006:3000
+      - 3006:3000  # Fix port mapping
+
     restart: on-failure
diff --git a/bbs-go-active/server/bbs-go.docker.yaml b/bbs-go-active/server/bbs-go.docker.yaml
index 31f0097..c7fe233 100644
--- a/bbs-go-active/server/bbs-go.docker.yaml
+++ b/bbs-go-active/server/bbs-go.docker.yaml
@@ -1,5 +1,5 @@
 Port: 8082 # 端口
-BaseUrl: http://127.0.0.1:3000 # 网站域名
+BaseUrl: https://active.deepseak.icu # 网站域名
 IpDataPath: # IP数据文件，默认读取当前目录下ip2region.xdb文件，最新数据文件请从这里下载：https://github.com/lionsoul2014/ip2region/tree/master/data
 AllowedOrigins:
   - "*"
diff --git a/bbs-go-active/site/.env.docker b/bbs-go-active/site/.env.docker
index c1d1768..56191af 100644
--- a/bbs-go-active/site/.env.docker
+++ b/bbs-go-active/site/.env.docker
@@ -1 +1 @@
-SERVER_URL=http://bbs-go:8082
+SERVER_URL=http://bbs-go-active:8082
diff --git a/bbs-go/Dockerfile b/bbs-go/Dockerfile
index 08ce14c..91826eb 100644
--- a/bbs-go/Dockerfile
+++ b/bbs-go/Dockerfile
@@ -1,45 +1,44 @@
 # server builder
 
-FROM golang:1.24 AS server_builder
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/library/golang:1.24 AS server_builder
 
 ENV APP_HOME=/code/bbs-go/server
 WORKDIR "$APP_HOME"
 
 COPY ./server ./
-# RUN go env -w GOPROXY=https://goproxy.cn,direct
+RUN go env -w GOPROXY=https://goproxy.cn,direct
 RUN go mod download
 RUN CGO_ENABLED=0 go build -v -o bbs-go main.go && chmod +x bbs-go
 
 
 # site builder
-FROM node:20-alpine AS site_builder
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/node:20.18.0-alpine AS site_builder
 
 ENV APP_HOME=/code/bbs-go/site
 WORKDIR "$APP_HOME"
 
 COPY ./site ./
-# RUN npm install -g pnpm --registry=https://registry.npmmirror.com
-# RUN pnpm install --registry=https://registry.npmmirror.com
-RUN npm install -g pnpm
-RUN pnpm install
+RUN npm install -g pnpm --registry=https://registry.npmmirror.com
+RUN pnpm install --registry=https://registry.npmmirror.com
+# RUN npm install -g pnpm
+# RUN pnpm install
 RUN pnpm build:docker
 
-
 # admin builder
-FROM node:20-alpine AS admin_builder
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/node:20.18.0-alpine AS admin_builder
 
 ENV APP_HOME=/code/bbs-go/admin
 WORKDIR "$APP_HOME"
 
 COPY ./admin ./
-# RUN npm install -g pnpm --registry=https://registry.npmmirror.com
-# RUN pnpm install --registry=https://registry.npmmirror.com
-RUN npm install -g pnpm
-RUN pnpm install
+RUN npm install -g pnpm --registry=https://registry.npmmirror.com
+RUN pnpm install --registry=https://registry.npmmirror.com
+# RUN npm install -g pnpm
+# RUN pnpm install
 RUN pnpm build:docker
 
 # run
-FROM node:20-alpine
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/node:20.18.0-alpine
 
 ENV APP_HOME=/app/bbs-go
 WORKDIR "$APP_HOME"
diff --git a/bbs-go/docker-compose.yml b/bbs-go/docker-compose.yml
index 219ff4a..3a6b192 100644
--- a/bbs-go/docker-compose.yml
+++ b/bbs-go/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 services:
   mysql:
     container_name: bbs-go-mysql
-    image: 'mysql:8.0'
+    image: 'swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/mysql:8.0.41'
     environment:
       TZ: Asia/Shanghai
       MYSQL_DATABASE: bbsgo_db
@@ -24,7 +24,7 @@ services:
 
   bbsgo:
     container_name: bbs-go
-    image: mlogclub/bbs-go:4.0.3
+    # image: mlogclub/bbs-go:4.0.3
     depends_on:
       mysql:
         condition: service_healthy
diff --git a/bbs-go/server/bbs-go.docker.yaml b/bbs-go/server/bbs-go.docker.yaml
index 31f0097..a829fd5 100644
--- a/bbs-go/server/bbs-go.docker.yaml
+++ b/bbs-go/server/bbs-go.docker.yaml
@@ -1,5 +1,5 @@
 Port: 8082 # 端口
-BaseUrl: http://127.0.0.1:3000 # 网站域名
+BaseUrl: https://bbs.deepseak.icu # 网站域名
 IpDataPath: # IP数据文件，默认读取当前目录下ip2region.xdb文件，最新数据文件请从这里下载：https://github.com/lionsoul2014/ip2region/tree/master/data
 AllowedOrigins:
   - "*"