Dev

.dockerignore

@@ -46,16 +46,16 @@ typings
 # Yarn Integrity file
 .yarn-integrity
 
-# dotenv environment variable files
-.env
-.env.test
-
-# local env files
-.env*.local
+## dotenv environment variable files
+#.env
+#.env.test
+#
+## local env files
+#.env*.local
 
 # Next.js build output
-.next
-out
+.next/
+# out
 
 # Nuxt.js build output
 .nuxt
@@ -95,3 +95,6 @@ Thumbs.db
 # secret key
 *.key
 *.key.pub
+
+# node
+node_modules

.github/workflows/dockerToHub-dev.yml

@@ -0,0 +1,74 @@
+name: DEV DEPLOY
+on:
+  workflow_dispatch:
+#  push:
+#    branches:
+#      - dev
+
+jobs:
+  build:
+    name: build test image to aly
+    runs-on: ubuntu-latest
+    #runs-on: self
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+        with:
+          ref: 'dev'
+          clean: false
+          github-server-url: 'https://gh.siji.ci'
+      - name: build and deploy to Docker Hub
+        run: |
+          #echo "${{ secrets.DOCKER_ENV }}" > .env
+          echo "COMPOSE_PROJECT_NAME=test-chatgpt-web" >> .env
+          #bash ./start.sh
+          # 替换测试镜像
+          sed -i 's@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:test@g' docker-compose.yml
+          sed -i 's|23000:|23001:|g' docker-compose.yml
+          docker-compose build
+          docker-compose push
+          yes | docker system prune --filter "until=168h"
+  deploy:
+    name: 部署到dev服务器
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+        with:
+          clean: true
+          ref: 'dev'
+          github-server-url: 'https://gh.siji.ci'
+      - name: Set up SSH key
+        uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+      - name: Sync repository to test server
+        run: |
+          sudo apt-get update && sudo apt-get install -y rsync
+          ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }} root@${{ secrets.UIYJ_SSH_IP }} 'mkdir -p /data/test/ChatGPT-Next-Web'
+          /usr/bin/rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ root@${{ secrets.UIYJ_SSH_IP }}:/data/test/ChatGPT-Next-Web
+      - name: deploy-to-tx
+        uses: appleboy/ssh-action@master
+        env:
+         SERVER_WORKDIR: ${{ secrets.SERVER_WORKDIR }} #传递工作目录变量
+        with:
+          host: ${{ secrets.UIYJ_SSH_IP }} #服务器地址
+          username: root #用户名
+          port: ${{ secrets.SSH_PORT }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }} #私钥 安全问题一定都以变量的方式传递！！！
+          envs: SERVER_WORKDIR,ALY_DOCKER_PASSWORD,ALY_DOCKER_USERNAME,DOCKER_ENV #使用工作目录变量
+          script: |
+            mkdir -p /data/test/ChatGPT-Next-Web
+            cd /data/test/ChatGPT-Next-Web
+            echo "${{ secrets.DOCKER_ENV }}" > .env
+            echo "PORT=23001" >> .env
+            # 测试分支,
+            echo "COMPOSE_PROJECT_NAME=test-chatgpt-web" >> .env
+            sed -i 's@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:test@g' docker-compose.yml
+            echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin
+            sed -i 's|container_name:|#container_name:|g' docker-compose.yml
+            docker-compose pull && docker-compose up -d
+            yes | docker image prune
+            rm -rf /www/server/nginx/proxy_cache_dir/* || true
+            rm -rf /www/server/nginx/proxy_temp_dir/* || true

.github/workflows/dockerToHub-dev.yml.bak

@@ -0,0 +1,109 @@
+name: DEV DEPLOY TO TX
+on:
+  workflow_dispatch:
+#  push:
+#    branches:
+#      - dev
+
+jobs:
+  build:
+    name: build test image to aly
+    # runs-on: thinkpad
+    runs-on: self
+    #    runs-on: self-hosted
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+        with:
+          ref: 'dev'
+          clean: false
+          github-server-url: 'https://gh.siji.ci'
+      - name: build and deploy to Docker Hub
+        run: |
+          echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin
+          echo "${{ secrets.DOCKER_ENV }}" > .env
+          echo "COMPOSE_PROJECT_NAME=test-chatgpt-web" >> .env
+          bash ./start.sh
+          # 替换测试镜像
+          sed -i 's@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:test@g' docker-compose.yml
+          sed -i 's|23000:|23001:|g' docker-compose.yml
+          docker-compose build
+          docker-compose push
+          yes | docker system prune --filter "until=168h"
+  deploy:
+    name: 部署到dev服务器
+    runs-on: self
+    needs: build
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+        with:
+          clean: true
+          ref: 'dev'
+          github-server-url: 'https://gh.siji.ci'
+      - name: Set up SSH key
+        uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+      - name: Sync repository to tx
+        run: |
+          yes | docker image prune
+          ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }} root@${{ secrets.TX_SSH_IP }} 'mkdir -p /data/test/ChatGPT-Next-Web'
+          rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ [email protected]:/data/test/ChatGPT-Next-Web
+      - name: deploy-to-tx
+        uses: appleboy/ssh-action@master
+        env:
+         SERVER_WORKDIR: ${{ secrets.SERVER_WORKDIR }} #传递工作目录变量
+        with:
+          host: ${{ secrets.TX_SSH_IP }} #服务器地址
+          username: root #用户名
+          port: ${{ secrets.SSH_PORT }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }} #私钥 安全问题一定都以变量的方式传递！！！
+          envs: SERVER_WORKDIR,ALY_DOCKER_PASSWORD,ALY_DOCKER_USERNAME,DOCKER_ENV #使用工作目录变量
+          script: |
+            cd /data/test/ChatGPT-Next-Web
+            echo "${{ secrets.DOCKER_ENV }}" > .env
+            # 测试分支,
+            echo "COMPOSE_PROJECT_NAME=test-chatgpt-web" >> .env
+            sed -i 's@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:test@g' docker-compose.yml
+            echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin
+            sed -i 's|23000:|23001:|g' docker-compose.yml
+            sed -i 's|container_name:|#container_name:|g' docker-compose.yml
+            docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns
+            docker-compose pull && docker-compose up -d
+            yes | docker image prune
+            rm -rf /www/server/nginx/proxy_cache_dir/* || true
+            rm -rf /www/server/nginx/proxy_temp_dir/* || true
+
+
+      - name: Sync repository to xy-nm
+        run: |
+          yes | docker image prune
+          ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }} root@${{ secrets.NM_SSH_IP }} 'mkdir -p /data/test/ChatGPT-Next-Web'
+          rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ [email protected]:/data/test/ChatGPT-Next-Web
+      - name: deploy-to-xy-nm
+        uses: appleboy/ssh-action@master
+        env:
+          SERVER_WORKDIR: ${{ secrets.SERVER_WORKDIR }} #传递工作目录变量
+        with:
+          host: ${{ secrets.NM_SSH_IP }} #服务器地址
+          username: root #用户名
+          port: ${{ secrets.SSH_PORT }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }} #私钥 安全问题一定都以变量的方式传递！！！
+          envs: SERVER_WORKDIR,ALY_DOCKER_PASSWORD,ALY_DOCKER_USERNAME,DOCKER_ENV #使用工作目录变量
+          script: |
+            cd /data/test/ChatGPT-Next-Web
+            echo "${{ secrets.DOCKER_ENV }}" > .env
+            # 测试分支,
+            echo "COMPOSE_PROJECT_NAME=test-chatgpt-web" >> .env
+            sed -i 's@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:test@g' docker-compose.yml
+            echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin
+            sed -i 's|23000:|23001:|g' docker-compose.yml
+            sed -i 's|container_name:|#container_name:|g' docker-compose.yml
+            docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns
+            docker-compose pull && docker-compose up -d
+            yes | docker image prune
+            rm -rf /www/server/nginx/proxy_cache_dir/* || true
+            rm -rf /www/server/nginx/proxy_temp_dir/* || true
+
+