diff --git a/Caddyfile b/Caddyfile index 803ea3c..a2a2438 100644 --- a/Caddyfile +++ b/Caddyfile @@ -2,9 +2,9 @@ # Add this to your existing Caddyfile on VPS # Option 1: Single domain with /api path (Recommended) -voxblog.yourdomain.com { +admin.pusula.blog { # Frontend (React Admin) - handle / { + handle { reverse_proxy localhost:3300 } diff --git a/docker-compose.yml b/docker-compose.yml index c32c5e0..970b049 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,9 +35,15 @@ services: NODE_ENV: production PORT: 3301 DATABASE_URL: mysql://voxblog:${MYSQL_PASSWORD}@mysql:3306/voxblog + DB_HOST: mysql + DB_PORT: 3306 + DB_USER: voxblog + DB_PASSWORD: ${MYSQL_PASSWORD} + DB_NAME: voxblog ADMIN_PASSWORD: ${ADMIN_PASSWORD} OPENAI_API_KEY: ${OPENAI_API_KEY} GHOST_ADMIN_API_KEY: ${GHOST_ADMIN_API_KEY} + GHOST_ADMIN_API_URL: ${GHOST_ADMIN_API_URL} S3_BUCKET: ${S3_BUCKET} S3_REGION: ${S3_REGION} S3_ACCESS_KEY: ${S3_ACCESS_KEY} diff --git a/docker/admin.Dockerfile b/docker/admin.Dockerfile index 34abba7..be50b26 100644 --- a/docker/admin.Dockerfile +++ b/docker/admin.Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine AS builder +FROM node:20-alpine AS builder WORKDIR /app @@ -37,6 +37,6 @@ EXPOSE 80 # Health check HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \ - CMD wget --no-verbose --tries=1 --spider http://localhost/ || exit 1 + CMD wget --no-verbose --tries=1 --spider http://127.0.0.1/ || exit 1 CMD ["nginx", "-g", "daemon off;"] diff --git a/docker/api.Dockerfile b/docker/api.Dockerfile index 674e859..9690341 100644 --- a/docker/api.Dockerfile +++ b/docker/api.Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine AS builder +FROM node:20-alpine AS builder WORKDIR /app ARG PNPM_FLAGS=--frozen-lockfile @@ -17,7 +17,7 @@ RUN pnpm install ${PNPM_FLAGS} COPY apps/api ./apps/api # Production image -FROM node:18-alpine +FROM node:20-alpine WORKDIR /app ARG PNPM_FLAGS=--frozen-lockfile