chore(docker): update ports and switch frontend to serve static files
- Change frontend port from 80 to 8847 and backend port from 3001 to 9173 in .env.example - Replace nginx stage in frontend Dockerfile with node alpine and serve for static hosting - Remove nginx.conf and related configuration for frontend static serving - Update docker-compose ports and healthcheck URLs to match new port assignments - Adjust server Dockerfile to expose new backend port 9173 and update healthcheck URL - Create non-root user in frontend Dockerfile and run serve command on port 8847 - Update healthcheck commands to use wget on new ports for both frontend and backend
This commit is contained in:
@@ -29,8 +29,8 @@ REDIRECT_URI=http://localhost:5173/auth/callback
|
|||||||
# ======================
|
# ======================
|
||||||
# Ports (Coolify will override these)
|
# Ports (Coolify will override these)
|
||||||
# ======================
|
# ======================
|
||||||
FRONTEND_PORT=80
|
FRONTEND_PORT=8847
|
||||||
BACKEND_PORT=3001
|
BACKEND_PORT=9173
|
||||||
|
|
||||||
# ======================
|
# ======================
|
||||||
# Environment
|
# Environment
|
||||||
|
|||||||
27
Dockerfile
27
Dockerfile
@@ -1,4 +1,4 @@
|
|||||||
# Frontend Dockerfile (Coolify Optimized)
|
# Frontend Dockerfile (Coolify Optimized - Static Server)
|
||||||
FROM node:20-alpine AS builder
|
FROM node:20-alpine AS builder
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
@@ -25,21 +25,26 @@ COPY . .
|
|||||||
# Build the app
|
# Build the app
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# Production stage
|
# Production stage - lightweight static server
|
||||||
FROM nginx:alpine
|
FROM node:20-alpine
|
||||||
|
|
||||||
# Install wget for healthcheck
|
WORKDIR /app
|
||||||
RUN apk add --no-cache wget
|
|
||||||
|
# Install serve for static file hosting
|
||||||
|
RUN npm install -g serve
|
||||||
|
|
||||||
# Copy built assets
|
# Copy built assets
|
||||||
COPY --from=builder /app/dist /usr/share/nginx/html
|
COPY --from=builder /app/dist ./dist
|
||||||
|
|
||||||
# Copy nginx config
|
# Create non-root user
|
||||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
RUN addgroup -g 1001 -S nodejs && \
|
||||||
|
adduser -S nodejs -u 1001
|
||||||
|
USER nodejs
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 8847
|
||||||
|
|
||||||
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
|
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
|
||||||
CMD wget -q --spider http://localhost:80 || exit 1
|
CMD wget -q --spider http://localhost:8847 || exit 1
|
||||||
|
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
# Serve static files with SPA fallback
|
||||||
|
CMD ["serve", "-s", "dist", "-l", "8847"]
|
||||||
|
|||||||
@@ -10,13 +10,13 @@ services:
|
|||||||
- VITE_GOOGLE_CLIENT_ID=${VITE_GOOGLE_CLIENT_ID}
|
- VITE_GOOGLE_CLIENT_ID=${VITE_GOOGLE_CLIENT_ID}
|
||||||
- VITE_API_URL=${VITE_API_URL:-}
|
- VITE_API_URL=${VITE_API_URL:-}
|
||||||
ports:
|
ports:
|
||||||
- "${FRONTEND_PORT:-80}:80"
|
- "${FRONTEND_PORT:-8847}:8847"
|
||||||
depends_on:
|
depends_on:
|
||||||
backend:
|
backend:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "wget", "-q", "--spider", "http://localhost:80" ]
|
test: [ "CMD", "wget", "-q", "--spider", "http://localhost:8847" ]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
@@ -29,9 +29,9 @@ services:
|
|||||||
context: ./server
|
context: ./server
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
ports:
|
ports:
|
||||||
- "${BACKEND_PORT:-3001}:3001"
|
- "${BACKEND_PORT:-9173}:9173"
|
||||||
environment:
|
environment:
|
||||||
- PORT=3001
|
- PORT=9173
|
||||||
- NODE_ENV=${NODE_ENV:-production}
|
- NODE_ENV=${NODE_ENV:-production}
|
||||||
- VITE_MS_CLIENT_ID=${VITE_MS_CLIENT_ID}
|
- VITE_MS_CLIENT_ID=${VITE_MS_CLIENT_ID}
|
||||||
- MS_CLIENT_SECRET=${MS_CLIENT_SECRET}
|
- MS_CLIENT_SECRET=${MS_CLIENT_SECRET}
|
||||||
@@ -40,7 +40,7 @@ services:
|
|||||||
- REDIRECT_URI=${REDIRECT_URI}
|
- REDIRECT_URI=${REDIRECT_URI}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "wget", "-q", "--spider", "http://localhost:3001/health" ]
|
test: [ "CMD", "wget", "-q", "--spider", "http://localhost:9173/health" ]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
|
|||||||
31
nginx.conf
31
nginx.conf
@@ -1,31 +0,0 @@
|
|||||||
server {
|
|
||||||
listen 80;
|
|
||||||
server_name localhost;
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
index index.html;
|
|
||||||
|
|
||||||
# Gzip compression
|
|
||||||
gzip on;
|
|
||||||
gzip_types text/plain text/css application/json application/javascript text/xml application/xml;
|
|
||||||
|
|
||||||
# Handle SPA routing
|
|
||||||
location / {
|
|
||||||
try_files $uri $uri/ /index.html;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Cache static assets
|
|
||||||
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2)$ {
|
|
||||||
expires 1y;
|
|
||||||
add_header Cache-Control "public, immutable";
|
|
||||||
}
|
|
||||||
|
|
||||||
# Proxy API requests to backend
|
|
||||||
location /api {
|
|
||||||
proxy_pass http://backend:3001;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection 'upgrade';
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_cache_bypass $http_upgrade;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -35,9 +35,9 @@ RUN addgroup -g 1001 -S nodejs && \
|
|||||||
adduser -S nodejs -u 1001
|
adduser -S nodejs -u 1001
|
||||||
USER nodejs
|
USER nodejs
|
||||||
|
|
||||||
EXPOSE 3001
|
EXPOSE 9173
|
||||||
|
|
||||||
HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=3 \
|
HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=3 \
|
||||||
CMD wget -q --spider http://localhost:3001/health || exit 1
|
CMD wget -q --spider http://localhost:9173/health || exit 1
|
||||||
|
|
||||||
CMD ["node", "dist/index.js"]
|
CMD ["node", "dist/index.js"]
|
||||||
|
|||||||
Reference in New Issue
Block a user