chore: test infra

Author: soorq

.env.example

@@ -18,10 +18,10 @@ DB_SCHEMA=base
 DATABASE_URL=postgres://${DB_USERNAME}:${DB_PASSWORD}@localhost:${DB_PORT}/${DB_DATABASE}
 
 # --- REDIS ---
-# in the docker network will be
+# in the docker network will be, not show port redis, at prod env
 # REDIS_HOST=redis
 # at development mode
-REDIS_HOST=redis
+REDIS_HOST=127.0.0.1
 REDIS_PORT=7000
 
 JWT_ACCESS_SECRET=same-same-same-same-same

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Build and Push
 
 on:
     push:
-        branches: [dev, main]
+        branches: [dev, main, feat/**]
 
 env:
     REGISTRY: ghcr.io
@@ -13,20 +13,20 @@ jobs:
         runs-on: ubuntu-latest
         permissions:
             contents: read
-            # packages: write
+            packages: write
 
         steps:
             - uses: actions/checkout@v4
 
             - name: Set up Docker Buildx
               uses: docker/setup-buildx-action@v3
 
-            # - name: Log in to the Container registry
-            #   uses: docker/login-action@v3
-            #   with:
-            #       registry: ${{ env.REGISTRY }}
-            #       username: ${{ github.actor }}
-            #       password: ${{ secrets.GITHUB_TOKEN }}
+            - name: Log in to the Container registry
+              uses: docker/login-action@v3
+              with:
+                  registry: ${{ env.REGISTRY }}
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Extract metadata (tags, labels)
               id: meta
@@ -36,13 +36,14 @@ jobs:
                   tags: |
                       type=ref,event=branch
                       type=sha,format=short
+                      type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
 
             - name: Build and push Docker image
               uses: docker/build-push-action@v5
               with:
                   context: .
                   file: ./Dockerfile.prod
-                  push: false # add true, if your setup variables
+                  push: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
                   cache-from: type=gha

Dockerfile.prod

@@ -28,6 +28,7 @@ ENV PORT=3000
 
 COPY --from=build /app/dist ./dist
 COPY --from=build /app/node_modules ./node_modules
+COPY --from=build /app/migrations ./migrations
 COPY --from=build /app/package.json ./
 
 EXPOSE 3000

infra/README.md

@@ -3,5 +3,5 @@
 Run it by pwd at root! Not include at this dir
 
 ```sh
-docker compose -f .\infra\compose.dev.yaml --env-file .env --profile infra up --build -d -V
+docker compose -f ./infra/dev/compose.dev.yaml --env-file .env --profile infra up --build -d -V
 ```

infra/dev/README.md

@@ -0,0 +1,3 @@
+# Файл для фронт разрабов
+
+Цель файла - дать инстанс бэка, чтоб фронты могли локально запускать с минимальными развертываниями

infra/compose.dev.yaml infra/dev/compose.dev.yamlinfra/compose.dev.yaml renamed to infra/dev/compose.dev.yaml

@@ -1,32 +1,37 @@
 version: "3.9"
 
-name: task-tracker
+name: task-tracker-api
 
 services:
   api:
     hostname: api
     container_name: api
-    build:
-      context: ../
-      dockerfile: Dockerfile.dev
-    restart: always
+    image: ghcr.io/task-tracker-lab/task-tracker-backend:feat-user
     env_file:
-      - ../.env
+      - .env
     ports:
       - "3000:3000"
     depends_on:
       database:
         condition: service_healthy
     networks:
       - backend
+    deploy:
+      resources:
+        limits:
+          cpus: "2.0"
+          memory: 1024M
+        reservations:
+          cpus: "0.5"
+          memory: 256M
 
   database:
     hostname: database
     container_name: database
     image: postgres:16-alpine
     restart: always
     env_file:
-      - ../.env
+      - .env
     environment:
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
@@ -38,7 +43,11 @@ services:
     networks:
       - backend
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U \"$$POSTGRES_USER\" -d \"$$POSTGRES_DB\" -q || exit 1"]
+      test:
+        [
+          "CMD-SHELL",
+          'pg_isready -U "$$POSTGRES_USER" -d "$$POSTGRES_DB" -q || exit 1',
+        ]
       interval: 5s
       timeout: 5s
       retries: 5

libs/config/src/config.schema.ts

@@ -14,7 +14,7 @@ export const ConfigSchema = z.object({
     DB_SCHEMA: z.string({ error: 'DB_SCHEMA is missing' }),
     DATABASE_URL: z.string().url('DATABASE_URL must be a valid connection string'),
     REDIS_HOST: z.string().default('redis'),
-    REDIS_PORT: z.coerce.number().default(6379),
+    REDIS_PORT: z.coerce.number().optional().default(6379),
     DOMAIN: z
         .string()
         .toLowerCase()

src/modules/app/app.controller.ts

@@ -60,7 +60,7 @@ import { S3Module } from '@libs/s3';
             useFactory: (cfg: ConfigService) => ({
                 connection: {
                     host: cfg.getOrThrow('REDIS_HOST'),
-                    port: cfg.getOrThrow('REDIS_PORT'),
+                    port: cfg.get('REDIS_PORT'),
                 },
             }),
         }),

src/modules/app/app.module.ts

@@ -37,12 +37,13 @@ import { BullMQAdapter } from '@bull-board/api/bullMQAdapter';
         RedisModule.forRootAsync({
             inject: [ConfigService],
             useFactory: async (cfg: ConfigService) => {
-                const host = cfg.get('REDIS_HOST', { infer: true });
-                const port = cfg.get('REDIS_PORT', { infer: true });
+                const host = cfg.getOrThrow('REDIS_HOST', { infer: true });
+                const port = cfg.get('REDIS_PORT');
+                const url = `redis://${host}${port ? '' : ':' + port}`;
 
                 return {
                     type: 'single',
-                    url: `redis://${host}:${port}`,
+                    url,
                     options: {
                         retryStrategy(times) {
                             return Math.min(times * 50, 2000);