配置docker一键启动

mlogclub · Sep 16, 2024 · 208edee · 208edee
1 parent ca9d254
commit 208edee
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 55 deletions.
diff --git a/.docker-compose/nginx.conf b/.docker-compose/nginx.conf
diff --git a/Dockerfile b/Dockerfile
@@ -20,10 +20,10 @@ 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
 
 
@@ -34,10 +34,10 @@ 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
@@ -52,12 +52,11 @@ COPY --from=server_builder /code/bbs-go/server/*.yaml ./server/
 COPY --from=server_builder /code/bbs-go/server/*.yml ./server/
 COPY --from=site_builder /code/bbs-go/site/.output ./site/.output
 COPY --from=site_builder /code/bbs-go/site/node_modules ./site/node_modules
-COPY --from=admin_builder /code/bbs-go/admin/dist ./admin
+COPY --from=admin_builder /code/bbs-go/admin/dist ./server/admin
 
 COPY ./start.sh ${APP_HOME}/start.sh
 RUN chmod +x ${APP_HOME}/start.sh
 
-EXPOSE 8082
-EXPOSE 3000
+EXPOSE 8082 3000 80
 
 CMD ["./start.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,25 +30,22 @@ services:
       context: ./
     volumes:
       - /data/docker:/data
-      - bbsgo-admin:/app/bbs-go/admin # 这里定义了一个卷
     environment:
       BBSGO_ENV: docker
       BBSGO_DB_URL: root:123456@tcp(bbs-go-mysql:3306)/bbsgo_db?charset=utf8mb4&parseTime=True&loc=Local
-      BBSGO_BASEURL: http://localhost
-    restart: on-failure
-
-
-  nginx:
-    container_name: bbs-go-nginx
-    image: nginx:latest
+      BBSGO_BASEURL: 
     ports:
-      - 80:80
-    volumes:
-      - .docker-compose/nginx.conf:/etc/nginx/conf.d/default.conf # 挂载自定义的 nginx 配置文件
-      - bbsgo-admin:/usr/share/nginx/html/admin # 使用同一个卷
-    depends_on:
-      - bbsgo
+      - 8082:8082
+      - 3000:3000
     restart: on-failure
 
-volumes:
-  bbsgo-admin: # 定义卷
+  # nginx:
+  #   container_name: bbs-go-nginx
+  #   image: nginx:latest
+  #   ports:
+  #     - 80:80
+  #   volumes:
+  #     - .docker-compose/nginx.conf:/etc/nginx/conf.d/default.conf
+  #   depends_on:
+  #     - bbsgo
+  #   restart: on-failure
diff --git a/server/.gitignore b/server/.gitignore
@@ -28,6 +28,7 @@ tags
 logs/*.log
 web/*
 tmp/*
+admin/*
 
 internal/web*
 

diff --git a/server/internal/server/server.go b/server/internal/server/server.go
@@ -51,6 +51,8 @@ func NewServer() {
 		})
 	})
 
+	app.HandleDir("/admin", "./admin")
+
 	// api
 	mvc.Configure(app.Party("/api"), func(m *mvc.Application) {
 		m.Party("/topic").Handle(new(api.TopicController))

diff --git a/site/nuxt.config.ts b/site/nuxt.config.ts
@@ -77,6 +77,9 @@ export default defineNuxtConfig({
       '/api/**': {
         proxy: `${import.meta.env.SERVER_URL}/api/**`,
       },
+      '/admin/**': {
+        proxy: `${import.meta.env.SERVER_URL}/admin/**`,
+      },
     },
   },