auto deploy on production server now finalized ready for smoke test.

2026-08-29 16:25:27 +03:30
parent 23c37519b5
commit 573e5e0886
10 changed files with 373 additions and 64 deletions
--- a/infrastructure/DEPLOY.md
+++ b/infrastructure/DEPLOY.md
@@ -1,13 +1,84 @@
 # Dyolink — Production Server Deploy Guide

-Deploy the full stack (Postgres, NestJS API, Next.js, Nginx, Let's Encrypt) on a fresh Linux server using **Docker Hub** images.
+Linux VPS serves **`https://nudentic.ir` only**. Images come from the **Gitea registry** (`wixur.ir:3000`) on git tags. Staging is Windows (`https://wixur.ir`) — see [`STAGING-DEPLOY.md`](STAGING-DEPLOY.md).

-**Example used in production:** `https://wixur.ir` on server `185.243.48.140`.
+**Automated path:** tag `v1.0.1` → [`.gitea/workflows/prod-tag-deploy.yml`](../.gitea/workflows/prod-tag-deploy.yml) (Windows runner builds, SSH to this server).
+
+**Manual / first SSL:** Docker Hub + [`scripts/build-and-push-prod.sh`](scripts/build-and-push-prod.sh) is still documented below as a fallback.
+
+**Example host:** `https://nudentic.ir` (do not point `wixur.ir` at this VPS).
+
+---
+
+## Automated deploy (Gitea tags)
+
+```
+git tag v1.0.1 && git push origin v1.0.1
+        ↓
+Windows act_runner builds frontend with https://nudentic.ir
+        ↓
+Push wixur.ir:3000/<owner>/dyolink-*:v1.0.1   (never :latest)
+        ↓
+SSH → Linux  docker login wixur.ir:3000  →  compose pull + up
+        ↓
+https://nudentic.ir
+```
+
+`:latest` is **staging only** (wixur.ir baked in). Production compose must pin `TAG=v1.0.1`.
+
+### One-time on the Linux server
+
+1. **HTTP registry** — Gitea is `http://wixur.ir:3000`. In `/etc/docker/daemon.json`:
+
+```json
+{
+  "insecure-registries": ["wixur.ir:3000"]
+}
+```
+
+Then `sudo systemctl restart docker` (containers restart).
+
+2. **`.env`** in `/opt/dyolink/infrastructure/` — from [`deploy.prod.env.example`](deploy.prod.env.example):
+
+- `DOMAIN=nudentic.ir`
+- `REGISTRY_PREFIX=wixur.ir:3000/<gitea-owner>` (same owner as Gitea `REGISTRY_OWNER`)
+- `TAG=v1.0.1` (CI overrides per release)
+
+3. **`secrets/backend.env`:** `FRONTEND_URL=https://nudentic.ir`, `COOKIE_SECURE=true`
+
+4. **SSH** — user that can run `docker` (e.g. `dyolink` in the `docker` group). Put the matching **public** key in `~/.ssh/authorized_keys`.
+
+5. **Test pull** (after a staging or prod image exists):
+
+```bash
+docker login wixur.ir:3000 -u <gitea-user>
+docker pull wixur.ir:3000/<owner>/dyolink-backend:<sha-or-tag>
+```
+
+### Gitea (same repo as staging)
+
+**Variables:** `PROD_PUBLIC_BASE_URL=https://nudentic.ir`, `PROD_REGISTRY_HOST=wixur.ir:3000`, `PROD_INFRA_DIR=/opt/dyolink/infrastructure`, plus existing `REGISTRY_HOST` / `REGISTRY_OWNER` / `CLONE_HOST`.
+
+**Secrets:** `PROD_SSH_HOST`, `PROD_SSH_USER`, `PROD_SSH_KEY` (private key). Reuse `REGISTRY_USERNAME` / `REGISTRY_PASSWORD`. Optional `PROD_SSH_PORT` (default 22).
+
+OpenSSH must be on the Windows runner (`ssh.exe` / `scp.exe`).
+
+### Release
+
+```bash
+git tag v1.0.1
+git push origin v1.0.1
+```
+
+Or Gitea → Actions → **Production — tag build, push, deploy** → Run → tag `v1.0.1`.
+
+Check `https://nudentic.ir/api/health`.

 ---

 ## Architecture

+
 ```
 Internet → Nginx (:80 / :443)
              ├── /      → frontend:3000  (Next.js)
@@ -18,8 +89,8 @@ Internet → Nginx (:80 / :443)
 | Service   | Image                              | Notes                          |
 |-----------|------------------------------------|--------------------------------|
 | postgres  | `postgres:15-alpine`               | Data in Docker volume          |
-| backend   | `dyolink/dyolink-backend:latest`   | Runs migrations + seed on start |
-| frontend  | `dyolink/dyolink-frontend:latest`  | URLs baked in at **build time** |
+| backend   | `REGISTRY_PREFIX/dyolink-backend:TAG` | Gitea `v*` or Hub `dyolink/…` |
+| frontend  | `REGISTRY_PREFIX/dyolink-frontend:TAG` | URLs baked in at **build time** |
 | nginx     | `nginx:alpine`                     | SSL termination + reverse proxy |
 | certbot   | `certbot/certbot`                  | Auto-renews certificates       |

@@ -289,16 +360,19 @@ Open `https://YOUR_DOMAIN` in a browser.

 ## Updating the app (new release)

-**On Mac** — build & push:
+**Preferred:** `git tag vX.Y.Z && git push origin vX.Y.Z` (Gitea production workflow).
+
+**Fallback (Docker Hub from a Mac):**

 ```bash
-./infrastructure/scripts/build-and-push-prod.sh wixur.ir latest
+./infrastructure/scripts/build-and-push-prod.sh nudentic.ir v1.0.1
 ```

-**On server:**
+**On server** (if not using CI):

 ```bash
 cd /opt/dyolink/infrastructure
+# TAG in .env or: TAG=v1.0.1 docker compose -f docker-compose.prod.yml --env-file .env pull backend frontend
 docker compose -f docker-compose.prod.yml --env-file .env pull backend frontend
 docker compose -f docker-compose.prod.yml --env-file .env up -d
 ```
@@ -361,6 +435,10 @@ docker volume rm dyolink_postgres_data_prod
 ./scripts/deploy-prod.sh
 ```

+### Docker login to `wixur.ir:3000`: `http response to HTTPS client`
+
+Add `"insecure-registries": ["wixur.ir:3000"]` to `/etc/docker/daemon.json` and restart Docker.
+
 ### View logs

 ```bash
@@ -385,12 +463,13 @@ docker compose -f docker-compose.prod.yml --env-file .env exec frontend \

 | Path on server | Purpose |
 |----------------|---------|
-| `/opt/dyolink/infrastructure/.env` | Domain, Docker Hub user, Let's Encrypt email |
+| `/opt/dyolink/infrastructure/.env` | `DOMAIN`, `REGISTRY_PREFIX`, `TAG`, Let's Encrypt email |
 | `/opt/dyolink/secrets/database.env` | Postgres credentials |
-| `/opt/dyolink/secrets/backend.env` | API secrets, DATABASE_URL, JWT, SMS |
+| `/opt/dyolink/secrets/backend.env` | API secrets, DATABASE_URL, JWT, SMS, `FRONTEND_URL` |
 | `/opt/dyolink/infrastructure/nginx/generated/default.conf` | Auto-generated nginx SSL config |
-| `/opt/dyolink/infrastructure/scripts/deploy-prod.sh` | Main deploy entry point |
-| `/opt/dyolink/infrastructure/scripts/build-and-push-prod.sh` | Build & push (run on Mac) |
+| `/opt/dyolink/infrastructure/scripts/prod-remote-deploy.sh` | Tag deploy (CI SSH) |
+| `/opt/dyolink/infrastructure/scripts/deploy-prod.sh` | First-time SSL + stack up |
+| `.gitea/workflows/prod-tag-deploy.yml` | CI: build, push `:v*`, SSH deploy |

 ---

--- a/infrastructure/STAGING-DEPLOY.md
+++ b/infrastructure/STAGING-DEPLOY.md
@@ -338,11 +338,11 @@ docker logs dyolink_frontend_staging --tail 50

 ---

-## Production (later)
+## Production (Linux + tags)

 | Environment | Trigger | Host |
 |-------------|---------|------|
-| Staging | Push/merge to `master` | Windows + Gitea |
-| Production | Git tag `v*.*.*` | Linux + `nudentic.ir` |
+| Staging | Push/merge to `master` | Windows + `https://wixur.ir` |
+| Production | Git tag `v*.*.*` | Linux + `https://nudentic.ir` |

-Production tag deploy (Gitea registry → Linux `nudentic.ir`) is **not** in this workflow yet. This file is Windows staging only.
+Workflow: [`.gitea/workflows/prod-tag-deploy.yml`](../.gitea/workflows/prod-tag-deploy.yml). Do **not** push production images as `:latest`. Setup: [`DEPLOY.md`](DEPLOY.md).
--- a/infrastructure/backend.prod.env.example
+++ b/infrastructure/backend.prod.env.example
@@ -12,7 +12,7 @@ JWT_REFRESH_SECRET=replace_with_a_different_openssl_rand_hex_32_output
 JWT_REFRESH_EXPIRES_IN=30d

 # Must match DOMAIN in .env — used for CORS, invite links, cookies
-FRONTEND_URL=https://wixur.ir
+FRONTEND_URL=https://nudentic.ir

 # Required for HTTPS — browsers reject Secure cookies over plain HTTP
 COOKIE_SECURE=true
--- a/infrastructure/deploy.prod.env.example
+++ b/infrastructure/deploy.prod.env.example
@@ -1,15 +1,27 @@
-# Copy to infrastructure/.env on the server (not committed).
+# Copy to infrastructure/.env on the Linux server (not committed).
 # docker compose -f docker-compose.prod.yml --env-file .env ...

-DOMAIN=wixur.ir
+DOMAIN=nudentic.ir
+
+# Gitea Container Registry (tag auto-deploy). Same packages Windows CI pushes
+# via host.docker.internal:3000 — Linux pulls via this hostname.
+# Format: <host>:<port>/<owner>  — no http://
+REGISTRY_PREFIX=wixur.ir:3000/admin
+
+# Image tag — CI sets this per release (v1.0.1). Do not use latest for Gitea prod
+# (staging already owns :latest with the wixur.ir frontend bake).
+TAG=v1.0.1
+
+# Hub-only fallback: comment out REGISTRY_PREFIX and use:
+# REGISTRY_PREFIX=dyolink
+# TAG=latest
 DOCKER_USERNAME=dyolink
-TAG=latest

 # Let's Encrypt — certificate issuance and renewal notices
 LETSENCRYPT_EMAIL=rameen.naghdi@gmail.com

-# Optional: extra hostnames on the same cert (space-separated), e.g. www.wixur.ir
-# CERTBOT_EXTRA_DOMAINS=www.wixur.ir
+# Optional: extra hostnames on the same cert (space-separated)
+# CERTBOT_EXTRA_DOMAINS=www.nudentic.ir

 # Optional: use Let's Encrypt staging while testing (avoids rate limits)
 # LETSENCRYPT_STAGING=1
--- a/infrastructure/docker-compose.prod.yml
+++ b/infrastructure/docker-compose.prod.yml
@@ -1,13 +1,11 @@
-# Production stack — pull images from Docker Hub, HTTPS via Let's Encrypt (certbot).
+# Production stack — pull backend/frontend from Gitea (or Docker Hub fallback).
+# HTTPS via Let's Encrypt (certbot) on this host only (nudentic.ir).
 #
-# Server setup (minimal):
-#   1. Copy deploy.prod.env.example → .env  (DOMAIN, DOCKER_USERNAME, LETSENCRYPT_EMAIL)
-#   2. Copy secrets/*.example → ../secrets/ (database.env, backend.env) — outside git
-#   3. docker login   (private Docker Hub images)
-#   4. ./scripts/init-letsencrypt.sh   (first time only)
-#   5. docker compose -f docker-compose.prod.yml --env-file .env up -d
+# Gitea tag deploy: set REGISTRY_PREFIX=wixur.ir:3000/<owner> and TAG=v1.0.1 in .env
+# Hub fallback: omit REGISTRY_PREFIX, set DOCKER_USERNAME=dyolink (image dyolink/dyolink-*).
 #
-# Updates: docker compose pull && docker compose up -d
+# First SSL: ./scripts/init-letsencrypt.sh then up -d
+# Tag updates: CI runs scripts/prod-remote-deploy.sh (or pull + up locally)

 name: dyolink-prod

@@ -39,7 +37,7 @@ services:
      start_period: 40s

  backend:
-    image: ${DOCKER_USERNAME}/dyolink-backend:${TAG:-latest}
+    image: ${REGISTRY_PREFIX:-dyolink}/dyolink-backend:${TAG:-latest}
    container_name: dyolink_backend_prod
    depends_on:
      postgres:
@@ -68,7 +66,7 @@ services:
      start_period: 60s

  frontend:
-    image: ${DOCKER_USERNAME}/dyolink-frontend:${TAG:-latest}
+    image: ${REGISTRY_PREFIX:-dyolink}/dyolink-frontend:${TAG:-latest}
    container_name: dyolink_frontend_prod
    depends_on:
      - backend
@@ -88,7 +86,8 @@ services:
        max-size: "10m"
        max-file: "3"
    healthcheck:
-      test: ["CMD", "node", "-e", "require('http').get('http://127.0.0.1:3000/', (r) => {if(r.statusCode!==200)process.exit(1)})"]
+      # Next.js `/` redirects to `/en` — accept 2xx/3xx.
+      test: ["CMD", "node", "-e", "require('http').get('http://127.0.0.1:3000/', (r) => { process.exit(r.statusCode >= 200 && r.statusCode < 400 ? 0 : 1); }).on('error', () => process.exit(1))"]
      interval: 30s
      timeout: 10s
      retries: 3
--- a/infrastructure/scripts/prod-remote-deploy.sh
+++ b/infrastructure/scripts/prod-remote-deploy.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Run on the Linux production host (CI SSHs here after pushing :v* images).
+# Usage: ./prod-remote-deploy.sh v1.0.1
+set -euo pipefail
+
+TAG="${1:?usage: prod-remote-deploy.sh v1.0.1}"
+INFRA="${PROD_INFRA_DIR:-/opt/dyolink/infrastructure}"
+cd "$INFRA"
+
+if [ ! -f .env ]; then
+  echo "Missing $INFRA/.env — copy deploy.prod.env.example and set DOMAIN=nudentic.ir REGISTRY_PREFIX=wixur.ir:3000/<owner>"
+  exit 1
+fi
+
+if ! grep -q '^REGISTRY_PREFIX=.\+' .env; then
+  echo "Set REGISTRY_PREFIX in .env (Gitea registry, e.g. wixur.ir:3000/admin). Do not use Docker Hub :latest for tag deploys."
+  exit 1
+fi
+
+export TAG
+echo "Pulling backend/frontend :$TAG from Gitea (REGISTRY_PREFIX in .env)"
+docker compose -f docker-compose.prod.yml --env-file .env pull backend frontend
+docker compose -f docker-compose.prod.yml --env-file .env up -d
+echo "=== Status ==="
+docker compose -f docker-compose.prod.yml --env-file .env ps
+echo "Health: https://nudentic.ir/api/health"