From b4cb6238474286e7a52b1e603d0a2a5ee8e775f2 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Sat, 1 Oct 2022 14:37:19 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/Dockerfile | 15 ---- client/docker-compose.yml | 11 --- pnpm-lock.yaml | 4 - server/Dockerfile | 33 ------- server/docker-compose.env | 26 ------ server/docker-compose.yml | 176 -------------------------------------- 6 files changed, 265 deletions(-) delete mode 100644 client/Dockerfile delete mode 100644 client/docker-compose.yml delete mode 100644 server/Dockerfile delete mode 100644 server/docker-compose.env delete mode 100644 server/docker-compose.yml diff --git a/client/Dockerfile b/client/Dockerfile deleted file mode 100644 index edd70c50..00000000 --- a/client/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM node:lts-alpine - -# Working directory -WORKDIR /app - -# Install dependencies -COPY . . -RUN npm install -g pnpm@6.24.2 http-server-spa@1.3.0 -RUN pnpm install - -EXPOSE 11011 - -RUN cd web && pnpm build - -CMD node web/scripts/sync-config-from-env.js && http-server-spa ./web/dist index.html 11011 diff --git a/client/docker-compose.yml b/client/docker-compose.yml deleted file mode 100644 index 15c2f5d8..00000000 --- a/client/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: "3.3" - -services: - tailchat-web: - build: - context: . - image: tailchat-web - environment: - SERVICE_URL: ${SERVICE_URL} - ports: - - 11011:11011 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a931ac1..cefe3e06 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -858,13 +858,9 @@ importers: server/plugins/com.msgbyte.topic/web/plugins/com.msgbyte.topic: specifiers: - less: ^4.1.3 react: 18.2.0 - rollup-plugin-less: ^1.1.3 devDependencies: - less: 4.1.3 react: 18.2.0 - rollup-plugin-less: 1.1.3 website: specifiers: diff --git a/server/Dockerfile b/server/Dockerfile deleted file mode 100644 index f5258312..00000000 --- a/server/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM node:lts-alpine - -# Working directory -WORKDIR /app - -# Install dependencies -RUN npm install -g pnpm@7.1.9 - -# Install plugins and sdk dependency -COPY ./package.json ./pnpm-lock.yaml ./pnpm-workspace.yaml ./tsconfig.json ./.npmrc ./ -COPY ./packages ./packages -COPY ./plugins ./plugins -RUN pnpm install - -# Copy source -COPY . . -RUN pnpm install - -# Build and cleanup -ENV NODE_ENV=production -RUN pnpm run build - -# Install plugins(whitelist) -RUN pnpm run plugin:install com.msgbyte.tasks com.msgbyte.linkmeta com.msgbyte.github com.msgbyte.simplenotify - -# Copy public files -RUN mkdir -p ./dist/public && cp -r ./public/plugins ./dist/public && cp ./public/registry.json ./dist/public - -# web static service port -EXPOSE 3000 - -# Start server -CMD ["pnpm", "start:service"] diff --git a/server/docker-compose.env b/server/docker-compose.env deleted file mode 100644 index 6f40a917..00000000 --- a/server/docker-compose.env +++ /dev/null @@ -1,26 +0,0 @@ -LOGGER=true -LOGLEVEL=info -SERVICEDIR=services - -TRANSPORTER=redis://redis:6379 - -CACHER=redis://redis:6379 - -REDIS_URL=redis://redis:6379 -MONGO_URL=mongodb://mongo/tailchat -SECRET= - -# file -API_URL=https://paw-server-nightly.moonrailgun.com - -# minio -MINIO_URL=minio:9000 -MINIO_USER=tailchat -MINIO_PASS=com.msgbyte.tailchat - -# SMTP -SMTP_SENDER= -SMTP_URI= - -# metrics -PROMETHEUS=1 diff --git a/server/docker-compose.yml b/server/docker-compose.yml deleted file mode 100644 index a5d7372e..00000000 --- a/server/docker-compose.yml +++ /dev/null @@ -1,176 +0,0 @@ -version: "3.3" - -services: - # 应用网关 - service-gateway: - build: - context: . - image: tailchat-server - restart: unless-stopped - env_file: docker-compose.env - environment: - SERVICES: core/gateway - PORT: 3000 - depends_on: - - mongo - - redis - labels: - - "traefik.enable=true" - - "traefik.http.routers.api-gw.rule=PathPrefix(`/`)" - - "traefik.http.services.api-gw.loadbalancer.server.port=3000" - networks: - - internal - - # 用户服务 - service-user: - build: - context: . - image: tailchat-server - restart: unless-stopped - env_file: docker-compose.env - environment: - SERVICES: core/user/* - depends_on: - - mongo - - redis - networks: - - internal - - # 群组服务 - service-group: - build: - context: . - image: tailchat-server - restart: unless-stopped - env_file: docker-compose.env - environment: - SERVICES: core/group/* - depends_on: - - mongo - - redis - networks: - - internal - - # 聊天服务 - service-chat: - build: - context: . - image: tailchat-server - restart: unless-stopped - env_file: docker-compose.env - environment: - SERVICES: core/chat/* - depends_on: - - mongo - - redis - networks: - - internal - - # 文件服务 / 插件注册中心 / 配置服务 - service-file: - build: - context: . - image: tailchat-server - restart: unless-stopped - env_file: docker-compose.env - environment: - SERVICES: core/file,core/plugin/registry,core/config - depends_on: - - mongo - - redis - - minio - networks: - - internal - - service-openapi: - build: - context: . - image: tailchat-server - restart: unless-stopped - env_file: docker-compose.env - environment: - SERVICES: openapi/app,openapi/oidc/oidc - OPENAPI_PORT: 3003 - OPENAPI_UNDER_PROXY: "true" - depends_on: - - mongo - - redis - - minio - labels: - - "traefik.enable=true" - - "traefik.http.routers.openapi-oidc.rule=PathPrefix(`/open`)" - - "traefik.http.services.openapi-oidc.loadbalancer.server.port=3003" - networks: - - internal - - # 插件服务(所有插件) - service-all-plugins: - build: - context: . - image: tailchat-server - restart: unless-stopped - env_file: docker-compose.env - environment: - SERVICEDIR: plugins - depends_on: - - mongo - - redis - - minio - networks: - - internal - - # 数据库 - mongo: - image: mongo:4 - restart: on-failure - volumes: - - data:/data/db - networks: - - internal - - # 数据缓存与中转通讯 - redis: - image: redis:alpine - restart: on-failure - networks: - - internal - - # 存储服务 - minio: - image: minio/minio - restart: on-failure - networks: - - internal - environment: - MINIO_ROOT_USER: tailchat - MINIO_ROOT_PASSWORD: com.msgbyte.tailchat - volumes: - - storage:/data - command: minio server /data --console-address ":9001" - - # 路由转发 - traefik: - image: traefik:v2.1 - restart: unless-stopped - command: - - "--api.insecure=true" # Don't do that in production! - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--entryPoints.web.address=:80" - - "--entryPoints.web.forwardedHeaders.insecure" # Not good - ports: - - 11000:80 - - 127.0.0.1:11001:8080 - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - networks: - - internal - - default - -networks: - internal: - name: tailchat-internal - -volumes: - data: - storage: