Merge branch 'till-dev' into dev

This commit is contained in:
Wuesteon 2025-12-24 22:49:01 +01:00
commit 42bb44b747
11 changed files with 2306 additions and 63 deletions

View file

@ -11,29 +11,26 @@ COPY pnpm-workspace.yaml ./
COPY package.json ./
COPY pnpm-lock.yaml ./
# Copy shared packages
COPY packages/better-auth-types ./packages/better-auth-types
# Copy shared packages (todo-backend uses shared-nestjs-auth)
COPY packages/shared-errors ./packages/shared-errors
COPY packages/shared-nestjs-auth ./packages/shared-nestjs-auth
COPY packages/shared-nestjs-cors ./packages/shared-nestjs-cors
# Copy todo backend
# Copy todo shared package and backend
COPY apps/todo/packages/shared ./apps/todo/packages/shared
COPY apps/todo/apps/backend ./apps/todo/apps/backend
# Install dependencies
RUN pnpm install --frozen-lockfile
# Build shared packages first
WORKDIR /app/packages/better-auth-types
RUN pnpm build
WORKDIR /app/packages/shared-errors
RUN pnpm build
WORKDIR /app/packages/shared-nestjs-auth
RUN pnpm build
WORKDIR /app/packages/shared-nestjs-cors
WORKDIR /app/apps/todo/packages/shared
RUN pnpm build
# Build the backend
@ -55,7 +52,7 @@ COPY --from=builder /app/package.json ./
COPY --from=builder /app/pnpm-lock.yaml ./
COPY --from=builder /app/node_modules ./node_modules
COPY --from=builder /app/packages ./packages
COPY --from=builder /app/apps/todo/apps/backend ./apps/todo/apps/backend
COPY --from=builder /app/apps/todo ./apps/todo
# Copy entrypoint script
COPY apps/todo/apps/backend/docker-entrypoint.sh /usr/local/bin/
@ -68,7 +65,7 @@ EXPOSE 3018
# Health check
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
CMD wget --no-verbose --tries=1 --spider http://localhost:3018/api/v1/health || exit 1
CMD wget --no-verbose --tries=1 --spider http://localhost:3018/api/health || exit 1
# Run entrypoint script
ENTRYPOINT ["docker-entrypoint.sh"]

View file

@ -1,23 +1,8 @@
#!/bin/sh
set -e
echo "=== Todo Backend Entrypoint ==="
echo "Starting Todo Backend..."
echo "Environment: ${NODE_ENV:-development}"
echo "Port: ${PORT:-3018}"
# Wait for PostgreSQL to be ready
echo "Waiting for PostgreSQL..."
until pg_isready -h ${DB_HOST:-postgres} -p ${DB_PORT:-5432} -U ${DB_USER:-postgres} 2>/dev/null; do
echo "PostgreSQL is unavailable - sleeping"
sleep 2
done
echo "PostgreSQL is up!"
cd /app/apps/todo/apps/backend
# Run schema push
echo "Pushing database schema..."
npx drizzle-kit push --force
echo "Schema push completed!"
# Execute the main command
echo "Starting application..."
exec "$@"