Merge branch 'main' into server/auth

Author: otsairaze

client/.github/workflows/ci.yml .github/workflows/client.ymlclient/.github/workflows/ci.yml renamed to .github/workflows/client.yml

@@ -1,27 +1,40 @@
-name: FRONTEND-CI
-
+name: client.yml
 on:
   push:
     branches:
       - main
+      - 'feature/**'
+    paths:
+      - 'client/**'
   pull_request:
     branches:
       - main
+    paths:
+      - 'client/**'
 
 jobs:
-  build-test:
-    runs-on: ubuntu-latest
+  build:
+    runs-on: ubuntu-22.04
+    defaults:
+      run:
+        working-directory: ./client
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+
+      - name: DEBUG stage
+        run: |
+          pwd
+          ls -la
+          echo "Current branch: ${GITHUB_REF}"  
 
-      #Node(Dockerfile)
-      - name: Setup Node.js
+      - name: Setup Nodejs
         uses: actions/setup-node@v4
         with:
-          node-version: 20
-          cache: npm
+          node-version: '20'
+          cache: 'npm'
+          cache-dependency-path: 'client/package-lock.json'
+
 
       #Dependencies
       - name: Install dependencies
@@ -42,15 +55,3 @@ jobs:
       #Production build
       - name: Build project
         run: npm run build
-
-  docker-build:
-    runs-on: ubuntu-latest
-    needs: build-test
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      #Docker
-      - name: Build Docker image
-        run: docker build -t lango-frontend .

.github/workflows/server.yml

@@ -0,0 +1,54 @@
+name: server.ci
+on:
+  push:
+    branches:
+    - main
+    - 'feature/**'
+    paths:
+      - 'server/**'
+      - 'prisma/**'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'server/**'
+      - 'prisma/**'
+
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    defaults:
+      run:
+        working-directory: ./server
+    env:
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: DEBUG stage
+        run: |
+          pwd
+          ls -la
+          echo "Current branch: ${GITHUB_REF}"
+
+      - name: Setup Nodejs
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+          cache-dependency-path: 'server/package-lock.json'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Prisma generate
+        run: npx prisma generate
+
+      - name: Prisma validate
+        run: npx prisma validate
+
+      - name: Build project
+        run: npm run build
+
+
+

client/Dockerfile

@@ -12,7 +12,7 @@ COPY . .
 RUN npm run build
 
 
-FROM alpine:3.19
+FROM alpine:20-alpine
 WORKDIR /app
 COPY --from=builder /app/dist ./dist
 

client/src/widgets/AsideMenu/ui/AsideMenu/AsideMenu.tsx

@@ -40,6 +40,8 @@ export const AsideMenu = memo((props: AsideMenuProps) => {
     }
   }, [locale]);
 
+  //testt
+
   return (
     <aside className={clsx(styles.aside, [className])}>
       <div>

infra/docker-compose.yml

@@ -1,10 +1,15 @@
 services:
   postgres:
-    image: postgres:15-alpine
+    image: postgres:17-alpine
     container_name: postgres
     restart: always
     env_file:
       - .env
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     volumes:
       - postgres:/var/lib/postgresql/data
     networks:
@@ -22,7 +27,8 @@ services:
     ports:
       - '3001:3000'
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     networks:
       - app-network
 

server/Dockerfile

@@ -1,30 +1,36 @@
 
-FROM node:20-alpine as builder
+FROM node:22-alpine as builder
 
 WORKDIR /app
 
 COPY package*.json ./
-COPY prisma ./prisma/
-
-
-RUN npm ci && npx prisma generate
+RUN npm ci
 
 COPY . .
 
+RUN npx prisma generate
+
 
 RUN npm run build && npm cache clean --force
 
-FROM node:20-alpine
+FROM node:22-alpine
 
 WORKDIR /app
 
+COPY --chown=node:node docker/entrypoint.sh ./entrypoint.sh
+RUN chmod +x ./entrypoint.sh
+
 COPY --from=builder --chown=node:node /app/node_modules ./node_modules
 COPY --from=builder --chown=node:node /app/package*.json ./
 COPY --from=builder --chown=node:node /app/dist ./dist
 COPY --from=builder --chown=node:node /app/prisma ./prisma
 
+
+COPY --from=builder --chown=node:node /app/prisma.config.ts ./
+
 USER node
 
 EXPOSE 3000
 
-CMD ["sh", "-c", "npx prisma migrate deploy && node dist/src/main"]
+ENTRYPOINT ["./entrypoint.sh"]
+

server/docker/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+echo "[DEBUG] Waiting for postgres (sleeping 5s)..."
+sleep 5
+
+echo "[DEBUG] Start prisma migration"
+npx prisma migrate deploy
+
+echo "[DEBUG] Starting application..."
+exec node dist/src/main.js