Merge pull request 'cambio jenkins' (#2) from develop into main

Reviewed-on: #2

Dockerfile

@@ -1,9 +1,7 @@
 # Stage 1: Dependencies
-FROM node:20-slim AS deps
+FROM node:20-alpine AS deps
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apk add --no-cache libc6-compat
-    openssl \
-    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
@@ -12,53 +10,41 @@ COPY package.json package-lock.json* ./
 RUN npm ci
 
 # Stage 2: Build
-FROM node:20-slim AS builder
+FROM node:20-alpine AS builder
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    openssl \
-    && rm -rf /var/lib/apt/lists/*
-
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
-ENV DATABASE_URL="file:./dev.db"
-
 RUN npx prisma generate
 
 RUN npm run build
 
 # Stage 3: Production
-FROM node:20-slim AS runner
+FROM node:20-alpine AS runner
 
 WORKDIR /app
 
 ENV NODE_ENV=production
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN addgroup --system --gid 1001 nodejs
-    openssl \
+RUN adduser --system --uid 1001 nextjs
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/.next/standalone ./
 COPY --from=builder /app/.next/static ./.next/static
 COPY --from=builder /app/prisma ./prisma
 COPY --from=builder /app/node_modules/.prisma ./node_modules/.prisma
-COPY --from=builder /app/node_modules/prisma ./node_modules/prisma
-COPY --from=builder /app/node_modules/@prisma ./node_modules/@prisma
 
 COPY --from=builder /app/prisma/schema.prisma /app/schema.prisma
-COPY docker-entrypoint.sh /usr/local/bin/
+
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+USER nextjs
 
 EXPOSE 3000
 
 ENV PORT=3000
 ENV HOSTNAME="0.0.0.0"
-ENV DATABASE_URL="file:/app/data/dev.db"
+ENV DATABASE_URL="file:./dev.db"
 
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD ["node", "server.js"]
-

Jenkinsfile

@@ -6,7 +6,7 @@ pipeline {
     }
     environment {
         URL_REGISTRY = 'gitea.danielarroyo.cl'
-        PROJECT = 'darroyo'
+        PROJECT = 'home-projects'
         REMOTE_USER = 'root'
         REMOTE_HOST = '10.5.0.116'
         REMOTE_PATH = '/compose'
@@ -39,12 +39,13 @@ pipeline {
                     try {
                         sh """
                             ls -la
-                            ls -la src || echo "Directorio src no encontrado"
+                            #ls -la src || echo "Directorio src no encontrado"
-                            ls -la src/main/docker || echo "Directorio src/main/docker no encontrado"
+                            #ls -la src/main/docker || echo "Directorio src/main/docker no encontrado"
-                            cat .dockerignore || echo ".dockerignore no encontrado"
+                            #cat .dockerignore || echo ".dockerignore no encontrado"
                             docker -v
                             docker build \
-                                -t ${URL_REGISTRY}/${PROJECT}/${NAME_SERVICE}:${BUILD_NUMBER} .
+                                -t ${URL_REGISTRY}/${PROJECT}/${NAME_SERVICE}:${BUILD_NUMBER} \
+                                -f .
                             docker tag ${URL_REGISTRY}/${PROJECT}/${NAME_SERVICE}:${BUILD_NUMBER} \
                                 ${URL_REGISTRY}/${PROJECT}/${NAME_SERVICE}:latest
                         """
@@ -85,13 +86,13 @@ services:
         - "traefik.http.routers.${NAME_SERVICE}.rule=Host(`recall.vodorod.cl`)"
     environment:
       - TZ=America/Santiago
-      - DATABASE_URL=file:/app/data/dev.db
+      - DATABASE_URL=file:./data/dev.db
     volumes:
         - ./data:/app/data
     networks:
       - homelab-net
-    mem_limit: 512m
+    mem_limit: 32m
-    mem_reservation: 256m
+    mem_reservation: 16m
     restart: unless-stopped
 networks:
   homelab-net:

README.md

@@ -248,7 +248,3 @@ src/
 └── types/
     └── note.ts
 ```
-
-
-
-nueva prueba

docker-compose.yml

@@ -8,5 +8,5 @@ services:
     volumes:
       - ./data:/app/data
     environment:
-      - DATABASE_URL=file:/app/data/dev.db
+      - DATABASE_URL=file:./data/dev.db
     restart: unless-stopped

docker-entrypoint.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-set -e
-
-cd /app
-
-echo "Checking database..."
-
-# Ensure data directory exists with proper permissions
-mkdir -p /app/data
-chmod 777 /app/data
-
-# Run db push (creates/updates database schema)
-# If it fails due to OOM but DB exists, continue anyway
-./node_modules/prisma/build/index.js db push --skip-generate || {
-    exit_code=$?
-    if [ -f /app/data/dev.db ]; then
-        echo "db push failed (code $exit_code) but database exists, continuing..."
-    else
-        echo "db push failed and database does not exist"
-        exit $exit_code
-    fi
-}
-
-echo "Starting application..."
-exec "$@"

src/app/api/export-import/route.ts

@@ -105,22 +105,21 @@ export async function POST(req: NextRequest) {
 
         const createdAt = parseDate((item as { createdAt?: string }).createdAt)
         const updatedAt = parseDate((item as { updatedAt?: string }).updatedAt)
-        const itemWithId = item as { id?: string }
 
-        if (itemWithId.id) {
+        if (item.id) {
-          const existing = await tx.note.findUnique({ where: { id: itemWithId.id } })
+          const existing = await tx.note.findUnique({ where: { id: item.id } })
           if (existing) {
             await tx.note.update({
-              where: { id: itemWithId.id },
+              where: { id: item.id },
               data: { ...noteData, createdAt, updatedAt },
             })
-            await tx.noteTag.deleteMany({ where: { noteId: itemWithId.id } })
+            await tx.noteTag.deleteMany({ where: { noteId: item.id } })
             processed++
           } else {
             await tx.note.create({
               data: {
                 ...noteData,
-                id: itemWithId.id,
+                id: item.id,
                 createdAt,
                 updatedAt,
                 creationSource: 'import',
@@ -151,8 +150,8 @@ export async function POST(req: NextRequest) {
           processed++
         }
 
-        const noteId = itemWithId.id
+        const noteId = item.id
-          ? (await tx.note.findUnique({ where: { id: itemWithId.id } }))?.id
+          ? (await tx.note.findUnique({ where: { id: item.id } }))?.id
           : (await tx.note.findFirst({ where: { title: item.title } }))?.id
 
         if (noteId && tags.length > 0) {

src/app/api/notes/[id]/route.ts

@@ -33,7 +33,7 @@ export async function PUT(req: NextRequest, { params }: { params: Promise<{ id:
       throw new ValidationError(result.error.issues)
     }
 
-    const { tags, id: _, ...noteData } = result.data
+    const { tags, ...noteData } = result.data
 
     const existingNote = await prisma.note.findUnique({ where: { id } })
     if (!existingNote) {

src/app/page.tsx

@@ -1,8 +1,6 @@
 import { Dashboard } from '@/components/dashboard'
 import { getDashboardData } from '@/lib/dashboard'
 
-export const dynamic = 'force-dynamic'
-
 export default async function HomePage() {
   const data = await getDashboardData(6)