diff --git a/Caddyfile b/Caddyfile new file mode 100644 index 0000000..0c559e8 --- /dev/null +++ b/Caddyfile @@ -0,0 +1,12 @@ +sur-way.ru { + log + # Все запросы на /api/* отправляем на бекенд + handle /api/* { + reverse_proxy backend:8080 + } + + # Все остальные запросы отправляем на фронтенд + handle /* { + reverse_proxy frontend:3000 + } +} \ No newline at end of file diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml new file mode 100644 index 0000000..13c001c --- /dev/null +++ b/docker-compose.prod.yml @@ -0,0 +1,89 @@ +services: + redis: + image: redis:7-alpine + container_name: poll-redis + volumes: + - redis-data:/data + - ./configs/redis.conf:/usr/local/etc/redis/redis.conf + command: redis-server /usr/local/etc/redis/redis.conf + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 10s + timeout: 3s + retries: 3 + networks: + - app-net + restart: always + + backend: + build: + context: ./backend + dockerfile: Dockerfile + # В проде порты наружу НЕ выставляем, доступ только через Caddy + expose: + - "8080" + environment: + - SERVER_HOST=0.0.0.0 + - SERVER_PORT=8080 + - BASE_URL=https://your-domain.com/api + - REDIS_HOST=redis + - REDIS_PORT=6379 + - REDIS_PASSWORD= + - REDIS_DB=0 + - POLL_DEFAULT_TTL=168h + depends_on: + redis: + condition: service_healthy + networks: + - app-net + restart: always + + frontend: + build: + context: ./frontend + dockerfile: Dockerfile + args: + - NEXT_PUBLIC_API_PROTOCOL=https + - NEXT_PUBLIC_API_HOST=your-domain.com + - NEXT_PUBLIC_API_PORT=443 + - NEXT_PUBLIC_API_VERSION=v1 + expose: + - "3000" + environment: + - NODE_ENV=production + - HOSTNAME=0.0.0.0 + - API_INTERNAL_PROTOCOL=http + - API_INTERNAL_HOST=backend + - API_INTERNAL_PORT=8080 + depends_on: + backend: + condition: service_started + networks: + - app-net + restart: always + + caddy: + image: caddy:alpine + container_name: caddy-ingress + restart: unless-stopped + ports: + - "80:80" + - "443:443" + volumes: + - ./Caddyfile:/etc/caddy/Caddyfile + - caddy_data:/data # Здесь хранятся SSL сертификаты + - caddy_config:/config + networks: + - app-net + depends_on: + - frontend + - backend + +volumes: + redis-data: + caddy_data: + caddy_config: + +networks: + app-net: + driver: bridge \ No newline at end of file diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 7deb6ae..c3dc54f 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,33 +1,41 @@ FROM node:20-alpine AS deps - WORKDIR /app ENV NODE_ENV=development - COPY package*.json ./ RUN npm ci FROM node:20-alpine AS builder - WORKDIR /app ENV NEXT_TELEMETRY_DISABLED=1 COPY --from=deps /app/node_modules ./node_modules COPY . . +# --- ВАЖНО: Объявляем ARG, чтобы Docker принял их при билде --- +ARG NEXT_PUBLIC_API_PROTOCOL +ARG NEXT_PUBLIC_API_HOST +ARG NEXT_PUBLIC_API_PORT +ARG NEXT_PUBLIC_API_VERSION +# -------------------------------------------------------------- + +# Эти переменные теперь будут доступны команде npm run build RUN npm run build FROM node:20-alpine AS runner - WORKDIR /app ENV NODE_ENV=production ENV NEXT_TELEMETRY_DISABLED=1 COPY --from=builder /app/public ./public -COPY --from=builder /app/.next ./.next -COPY package*.json ./ - -RUN npm ci --omit=dev +COPY --from=builder /app/.next/static ./.next/static +COPY --from=builder /app/.next/standalone ./ +# Обрати внимание: для продакшена лучше использовать standalone режим (настраивается в next.config.js), +# но если у тебя стандартный билд, то копируй как было: +# COPY --from=builder /app/.next ./.next +# COPY package*.json ./ EXPOSE 3000 -CMD ["npm", "run", "start"] +# Если standalone: CMD ["node", "server.js"] +# Если стандартный: +CMD ["npm", "run", "start"] \ No newline at end of file