ci: rework the deployment workflow with docker

.github/workflows/deploy.yml

@@ -1,74 +1,60 @@
 name: Build, Test and Deploy Discord Bot to VPS
 
 on:
-  workflow_dispatch: # Manual trigger only
-  # Uncomment below when VPS is ready:
-  # push:
-  #   branches: [ "main" ]
-  #   paths-ignore:
-  #     - 'docs/**'
-  #     - '.gitignore'
-  #     - 'LICENSE'
+  push:
+    branches: [ "main" ]
+  workflow_dispatch: # Allow manual deployment
 
 jobs:
-  build-test-deploy:
+  deploy:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Install dependencies
-        run: |
-          if [ -f package-lock.json ]; then
-            npm ci --no-audit --no-fund
-          else
-            npm install --no-audit --no-fund
-          fi
-
-      - name: Lint
-        run: npm run lint
-
-      - name: Build bot
-        run: npm run build:ci
-
-      - name: Run tests
-        run: npm run test:ci
-
-      - name: Package build output
-        run: tar czf bot-build.tar.gz ./dist
-
-      - name: Copy build artifact to VPS
-        uses: appleboy/scp-action@v0.1.7
-        with:
-          host: ${{ secrets.VPS_HOST }}
-          username: ${{ secrets.VPS_USER }}
-          key: ${{ secrets.VPS_SSH_KEY }}
-          source: "bot-build.tar.gz"
-          target: "/home/${{ secrets.VPS_USER }}/discord-bot/"
-
-      - name: Create .env file on VPS
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.VPS_HOST }}
-          username: ${{ secrets.VPS_USER }}
-          key: ${{ secrets.VPS_SSH_KEY }}
-          script: |
-            echo "DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }}" > /home/${{ secrets.VPS_USER }}/discord-bot/.env
-            echo "CLIENT_ID=${{ secrets.CLIENT_ID }}" >> /home/${{ secrets.VPS_USER }}/discord-bot/.env
-
-      - name: Extract and restart bot on VPS
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.VPS_HOST }}
-          username: ${{ secrets.VPS_USER }}
-          key: ${{ secrets.VPS_SSH_KEY }}
-          script: |
-            cd /home/${{ secrets.VPS_USER }}/discord-bot/
-            tar xzf bot-build.tar.gz
-            pm2 restart bot || pm2 start ./dist/index.js --name bot
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Read Node version
+      run: |
+        NODE_VERSION=$(cat .nvmrc | sed 's/v//')
+        echo "NODE_VERSION=$NODE_VERSION" >> $GITHUB_ENV
+
+    - name: Deploy to VPS
+      uses: appleboy/ssh-action@v1.0.3
+      with:
+        host: ${{ secrets.VPS_HOST }}
+        username: ${{ secrets.VPS_USER }}
+        key: ${{ secrets.VPS_SSH_KEY }}
+        script: |
+          cd /home/${{ secrets.VPS_USER }}/webdev-bot-deploy
+
+          # Stash any local changes
+          git stash push -m "Auto-deploy $(date)" 2>/dev/null || true
+
+          # Pull latest changes
+          git checkout main
+          git pull origin main
+
+          # Read NODE_VERSION from .nvmrc
+          export NODE_VERSION=$(cat .nvmrc | sed 's/v//')
+          echo "Using Node version: $NODE_VERSION"
+
+          # Create .env.local file with secrets
+          cat > .env.local << EOF
+          DISCORD_TOKEN=${{ secrets.DISCORD_TOKEN }}
+          CLIENT_ID=${{ secrets.CLIENT_ID }}
+          GUIDES_CHANNEL_ID=${{ secrets.GUIDES_CHANNEL_ID }}
+          SERVER_ID=${{ secrets.SERVER_ID }}
+          REPEL_LOG_CHANNEL_ID=${{ secrets.REPEL_LOG_CHANNEL_ID }}
+          REPEL_ROLE_ID=${{ secrets.REPEL_ROLE_ID }}
+          MODERATORS_ROLE_IDS=${{ secrets.MODERATORS_ROLE_IDS }}
+          EOF
+
+          # Stop any existing containers
+          docker compose down || true
+
+          # Build and start production container with profile
+          docker compose --profile prod up -d --build
+
+          # Check status
+          echo "Deployment completed. Container status:"
+          docker compose ps

.github/workflows/shorter-deploy.yml

@@ -0,0 +1,38 @@
+name: Build, Test and Deploy Discord Bot to VPS but shorter
+
+on:
+  workflow_dispatch: # Allow manual deployment
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Deploy to VPS
+      uses: appleboy/ssh-action@v1.0.3
+      with:
+        host: ${{ secrets.VPS_HOST }}
+        username: ${{ secrets.VPS_USER }}
+        key: ${{ secrets.VPS_SSH_KEY }}
+        script: |
+          cd /home/${{ secrets.VPS_USER }}/webdev-bot
+
+          # Stash any local changes
+          git stash push -m "Auto-deploy $(date)" 2>/dev/null || true
+
+          # Pull latest changes
+          git checkout main
+          git pull origin main
+
+          # Stop any existing containers
+          docker-compose down || true
+
+          # Build and start production container with profile
+          docker-compose --profile prod up -d --build
+
+          # Check status
+          echo "Deployment completed. Container status:"
+          docker-compose ps

Dockerfile

@@ -13,14 +13,14 @@ FROM base AS deps
 
 COPY package.json pnpm-lock.yaml ./
 
-RUN pnpm install --prod --frozen-lockfile
+RUN pnpm install --frozen-lockfile --production --ignore-scripts
 
 # Dev dependencies stage - Install all dependencies
 FROM base AS deps-dev
 
 COPY package.json pnpm-lock.yaml ./
 
-RUN pnpm install --frozen-lockfile
+RUN pnpm install --frozen-lockfile --ignore-scripts
 
 # Build stage - Compile TypeScript
 FROM deps-dev AS build
@@ -41,6 +41,9 @@ COPY --from=deps /app/node_modules ./node_modules
 COPY --from=build /app/dist ./dist
 COPY package.json ./
 
+# Create data directory and set permissions for node user
+RUN mkdir -p /app/data && chown -R node:node /app/data
+
 # Run as non-root user for security
 USER node
 
@@ -53,6 +56,9 @@ ENV NODE_ENV=development
 
 COPY . .
 
+# Create data directory and set permissions for node user
+RUN mkdir -p /app/data && chown -R node:node /app/data
+
 # Run as non-root user for security
 USER node
 

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   # Production service - optimized runtime
   bot-prod:
@@ -12,6 +10,11 @@ services:
     restart: unless-stopped
     env_file:
       - .env.local
+    environment:
+      - GUIDES_TRACKER_PATH=/app/data/guides-tracker.json
+    volumes:
+      # Persist guides tracker data
+      - guides-data:/app/data
     profiles:
       - prod
 
@@ -26,6 +29,8 @@ services:
     restart: unless-stopped
     env_file:
       - .env.local
+    environment:
+      - GUIDES_TRACKER_PATH=/app/data/guides-tracker.json
     volumes:
       # Mount source code for hot reload
       - ./src:/app/src:ro
@@ -35,6 +40,11 @@ services:
       # Mount package files (in case dependencies change)
       - ./package.json:/app/package.json:ro
       - ./pnpm-lock.yaml:/app/pnpm-lock.yaml:ro
+      # Persist guides tracker data
+      - guides-data:/app/data
     profiles:
       - dev
 
+volumes:
+  guides-data:
+    driver: local

package.json

@@ -34,6 +34,7 @@
   "packageManager": "pnpm@10.17.1",
   "dependencies": {
     "discord.js": "^14.22.1",
+    "typescript": "^5.9.3",
     "web-features": "^3.3.0"
   },
   "devDependencies": {
@@ -42,8 +43,7 @@
     "husky": "^9.1.7",
     "lint-staged": "^16.2.1",
     "tsup": "^8.5.0",
-    "tsx": "^4.20.6",
-    "typescript": "^5.9.2"
+    "tsx": "^4.20.6"
   },
   "lint-staged": {
     "*.{ts,js}": [