Compare commits
32 Commits
ad21d7fb6a
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| 7fce46bff2 | |||
| d398226723 | |||
| 85bbe7b61f | |||
| de1de1d3bc | |||
| ef8a7858b2 | |||
| dc5089c011 | |||
| 0e22acc077 | |||
| 85e6304bae | |||
| cf6b5785d7 | |||
| 66db3de33d | |||
| a0451a2084 | |||
| d91ff3f07c | |||
| d5a6d0bfd7 | |||
| 97082b0233 | |||
| 93b6c0b17d | |||
| f038f37001 | |||
| e5e976caff | |||
| e5b6ce3bdc | |||
| 5fb1c5d0b0 | |||
| f6218283f1 | |||
| 3ff5e6b031 | |||
| 1916bc33e4 | |||
| 9847b4c5cc | |||
| fc53062eb1 | |||
| 28366151cf | |||
| c8674dd56f | |||
| 3a523aafde | |||
| 9ca98d96db | |||
| bd1a5bc21c | |||
| 2f9233ad41 | |||
| 76c98ecdbe | |||
| b4a5abb699 |
+23
-9
@@ -1,7 +1,9 @@
|
||||
# Stage 1: Dependencies
|
||||
FROM node:20-alpine AS deps
|
||||
FROM node:20-slim AS deps
|
||||
|
||||
RUN apk add --no-cache libc6-compat
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
openssl \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
@@ -10,41 +12,53 @@ COPY package.json package-lock.json* ./
|
||||
RUN npm ci
|
||||
|
||||
# Stage 2: Build
|
||||
FROM node:20-alpine AS builder
|
||||
FROM node:20-slim 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-alpine AS runner
|
||||
FROM node:20-slim AS runner
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
ENV NODE_ENV=production
|
||||
|
||||
RUN addgroup --system --gid 1001 nodejs
|
||||
RUN adduser --system --uid 1001 nextjs
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
openssl \
|
||||
&& 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
|
||||
|
||||
USER nextjs
|
||||
COPY docker-entrypoint.sh /usr/local/bin/
|
||||
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
ENV PORT=3000
|
||||
ENV HOSTNAME="0.0.0.0"
|
||||
ENV DATABASE_URL="file:./dev.db"
|
||||
ENV DATABASE_URL="file:/app/data/dev.db"
|
||||
|
||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
||||
CMD ["node", "server.js"]
|
||||
|
||||
|
||||
Vendored
+5
-6
@@ -6,7 +6,7 @@ pipeline {
|
||||
}
|
||||
environment {
|
||||
URL_REGISTRY = 'gitea.danielarroyo.cl'
|
||||
PROJECT = 'home-projects'
|
||||
PROJECT = 'darroyo'
|
||||
REMOTE_USER = 'root'
|
||||
REMOTE_HOST = '10.5.0.116'
|
||||
REMOTE_PATH = '/compose'
|
||||
@@ -44,8 +44,7 @@ pipeline {
|
||||
cat .dockerignore || echo ".dockerignore no encontrado"
|
||||
docker -v
|
||||
docker build \
|
||||
-t ${URL_REGISTRY}/${PROJECT}/${NAME_SERVICE}:${BUILD_NUMBER} \
|
||||
-f .
|
||||
-t ${URL_REGISTRY}/${PROJECT}/${NAME_SERVICE}:${BUILD_NUMBER} .
|
||||
docker tag ${URL_REGISTRY}/${PROJECT}/${NAME_SERVICE}:${BUILD_NUMBER} \
|
||||
${URL_REGISTRY}/${PROJECT}/${NAME_SERVICE}:latest
|
||||
"""
|
||||
@@ -86,13 +85,13 @@ services:
|
||||
- "traefik.http.routers.${NAME_SERVICE}.rule=Host(`recall.vodorod.cl`)"
|
||||
environment:
|
||||
- TZ=America/Santiago
|
||||
- DATABASE_URL=file:./data/dev.db
|
||||
- DATABASE_URL=file:/app/data/dev.db
|
||||
volumes:
|
||||
- ./data:/app/data
|
||||
networks:
|
||||
- homelab-net
|
||||
mem_limit: 32m
|
||||
mem_reservation: 16m
|
||||
mem_limit: 512m
|
||||
mem_reservation: 256m
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
homelab-net:
|
||||
|
||||
BIN
Binary file not shown.
+1
-1
@@ -8,5 +8,5 @@ services:
|
||||
volumes:
|
||||
- ./data:/app/data
|
||||
environment:
|
||||
- DATABASE_URL=file:./data/dev.db
|
||||
- DATABASE_URL=file:/app/data/dev.db
|
||||
restart: unless-stopped
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
#!/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 "$@"
|
||||
@@ -105,21 +105,22 @@ 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 (item.id) {
|
||||
const existing = await tx.note.findUnique({ where: { id: item.id } })
|
||||
if (itemWithId.id) {
|
||||
const existing = await tx.note.findUnique({ where: { id: itemWithId.id } })
|
||||
if (existing) {
|
||||
await tx.note.update({
|
||||
where: { id: item.id },
|
||||
where: { id: itemWithId.id },
|
||||
data: { ...noteData, createdAt, updatedAt },
|
||||
})
|
||||
await tx.noteTag.deleteMany({ where: { noteId: item.id } })
|
||||
await tx.noteTag.deleteMany({ where: { noteId: itemWithId.id } })
|
||||
processed++
|
||||
} else {
|
||||
await tx.note.create({
|
||||
data: {
|
||||
...noteData,
|
||||
id: item.id,
|
||||
id: itemWithId.id,
|
||||
createdAt,
|
||||
updatedAt,
|
||||
creationSource: 'import',
|
||||
@@ -150,8 +151,8 @@ export async function POST(req: NextRequest) {
|
||||
processed++
|
||||
}
|
||||
|
||||
const noteId = item.id
|
||||
? (await tx.note.findUnique({ where: { id: item.id } }))?.id
|
||||
const noteId = itemWithId.id
|
||||
? (await tx.note.findUnique({ where: { id: itemWithId.id } }))?.id
|
||||
: (await tx.note.findFirst({ where: { title: item.title } }))?.id
|
||||
|
||||
if (noteId && tags.length > 0) {
|
||||
|
||||
@@ -33,7 +33,7 @@ export async function PUT(req: NextRequest, { params }: { params: Promise<{ id:
|
||||
throw new ValidationError(result.error.issues)
|
||||
}
|
||||
|
||||
const { tags, ...noteData } = result.data
|
||||
const { tags, id: _, ...noteData } = result.data
|
||||
|
||||
const existingNote = await prisma.note.findUnique({ where: { id } })
|
||||
if (!existingNote) {
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user