bbsgo activego

This commit is contained in:
awei
2025-03-04 00:22:36 +08:00
parent 113756eaae
commit 9b10835b61
7 changed files with 42 additions and 40 deletions

View File

@@ -1,45 +1,45 @@
# server builder # 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 ENV APP_HOME=/code/bbs-go/server
WORKDIR "$APP_HOME" WORKDIR "$APP_HOME"
COPY ./server ./ 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 go mod download
RUN CGO_ENABLED=0 go build -v -o bbs-go main.go && chmod +x bbs-go RUN CGO_ENABLED=0 go build -v -o bbs-go main.go && chmod +x bbs-go
# site builder # 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 ENV APP_HOME=/code/bbs-go/site
WORKDIR "$APP_HOME" WORKDIR "$APP_HOME"
COPY ./site ./ COPY ./site ./
# RUN npm install -g pnpm --registry=https://registry.npmmirror.com RUN npm install -g pnpm --registry=https://registry.npmmirror.com
# RUN pnpm install --registry=https://registry.npmmirror.com RUN pnpm install --registry=https://registry.npmmirror.com
RUN npm install -g pnpm # RUN npm install -g pnpm
RUN pnpm install # RUN pnpm install
RUN pnpm build:docker RUN pnpm build:docker
# admin builder # 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 ENV APP_HOME=/code/bbs-go/admin
WORKDIR "$APP_HOME" WORKDIR "$APP_HOME"
COPY ./admin ./ COPY ./admin ./
# RUN npm install -g pnpm --registry=https://registry.npmmirror.com RUN npm install -g pnpm --registry=https://registry.npmmirror.com
# RUN pnpm install --registry=https://registry.npmmirror.com RUN pnpm install --registry=https://registry.npmmirror.com
RUN npm install -g pnpm # RUN npm install -g pnpm
RUN pnpm install # RUN pnpm install
RUN pnpm build:docker RUN pnpm build:docker
# run # 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 ENV APP_HOME=/app/bbs-go
WORKDIR "$APP_HOME" WORKDIR "$APP_HOME"

View File

@@ -3,8 +3,8 @@ networks:
driver: bridge driver: bridge
services: services:
mysql: mysql:
container_name: bbs-go-mysql container_name: bbs-go-mysql-active
image: 'mysql:8.0' image: 'swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/mysql:8.0.41'
environment: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
MYSQL_DATABASE: bbsgo_db MYSQL_DATABASE: bbsgo_db
@@ -23,8 +23,8 @@ services:
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
bbsgo: bbsgo:
container_name: bbs-go container_name: bbs-go-active
image: mlogclub/bbs-go:4.0.3 # image: mlogclub/bbs-go:4.0.3
depends_on: depends_on:
mysql: mysql:
condition: service_healthy condition: service_healthy
@@ -32,11 +32,14 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
context: ./ context: ./
volumes: volumes:
- /data/docker:/data - /data/docker-active:/data
environment: environment:
BBSGO_ENV: docker BBSGO_ENV: docker
BBSGO_DB_URL: root:123456@tcp(bbs-go-mysql:3306)/bbsgo_db?charset=utf8mb4&parseTime=True&multiStatements=true&loc=Local BBSGO_DB_URL: root:123456@tcp(bbs-go-mysql-active:3306)/bbsgo_db?charset=utf8mb4&parseTime=True&multiStatements=true&loc=Local
BBSGO_BASEURL: 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: ports:
- 3006:3000 - 3006:3000 # Fix port mapping
restart: on-failure restart: on-failure

View File

@@ -1,5 +1,5 @@
Port: 8082 # 端口 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 IpDataPath: # IP数据文件默认读取当前目录下ip2region.xdb文件最新数据文件请从这里下载https://github.com/lionsoul2014/ip2region/tree/master/data
AllowedOrigins: AllowedOrigins:
- "*" - "*"

View File

@@ -1 +1 @@
SERVER_URL=http://bbs-go:8082 SERVER_URL=http://bbs-go-active:8082

View File

@@ -1,45 +1,44 @@
# server builder # 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 ENV APP_HOME=/code/bbs-go/server
WORKDIR "$APP_HOME" WORKDIR "$APP_HOME"
COPY ./server ./ 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 go mod download
RUN CGO_ENABLED=0 go build -v -o bbs-go main.go && chmod +x bbs-go RUN CGO_ENABLED=0 go build -v -o bbs-go main.go && chmod +x bbs-go
# site builder # 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 ENV APP_HOME=/code/bbs-go/site
WORKDIR "$APP_HOME" WORKDIR "$APP_HOME"
COPY ./site ./ COPY ./site ./
# RUN npm install -g pnpm --registry=https://registry.npmmirror.com RUN npm install -g pnpm --registry=https://registry.npmmirror.com
# RUN pnpm install --registry=https://registry.npmmirror.com RUN pnpm install --registry=https://registry.npmmirror.com
RUN npm install -g pnpm # RUN npm install -g pnpm
RUN pnpm install # RUN pnpm install
RUN pnpm build:docker RUN pnpm build:docker
# admin builder # 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 ENV APP_HOME=/code/bbs-go/admin
WORKDIR "$APP_HOME" WORKDIR "$APP_HOME"
COPY ./admin ./ COPY ./admin ./
# RUN npm install -g pnpm --registry=https://registry.npmmirror.com RUN npm install -g pnpm --registry=https://registry.npmmirror.com
# RUN pnpm install --registry=https://registry.npmmirror.com RUN pnpm install --registry=https://registry.npmmirror.com
RUN npm install -g pnpm # RUN npm install -g pnpm
RUN pnpm install # RUN pnpm install
RUN pnpm build:docker RUN pnpm build:docker
# run # 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 ENV APP_HOME=/app/bbs-go
WORKDIR "$APP_HOME" WORKDIR "$APP_HOME"

View File

@@ -4,7 +4,7 @@ networks:
services: services:
mysql: mysql:
container_name: bbs-go-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: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
MYSQL_DATABASE: bbsgo_db MYSQL_DATABASE: bbsgo_db
@@ -24,7 +24,7 @@ services:
bbsgo: bbsgo:
container_name: bbs-go container_name: bbs-go
image: mlogclub/bbs-go:4.0.3 # image: mlogclub/bbs-go:4.0.3
depends_on: depends_on:
mysql: mysql:
condition: service_healthy condition: service_healthy

View File

@@ -1,5 +1,5 @@
Port: 8082 # 端口 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 IpDataPath: # IP数据文件默认读取当前目录下ip2region.xdb文件最新数据文件请从这里下载https://github.com/lionsoul2014/ip2region/tree/master/data
AllowedOrigins: AllowedOrigins:
- "*" - "*"