Prod/Dev mode
This commit is contained in:
65
README.md
65
README.md
@@ -68,9 +68,13 @@ membership/
|
|||||||
- SMTP2GO API key (for email notifications)
|
- SMTP2GO API key (for email notifications)
|
||||||
- Database password (if desired)
|
- Database password (if desired)
|
||||||
|
|
||||||
3. **Start the services**:
|
3. **Start the services in your preferred mode**:
|
||||||
```bash
|
```bash
|
||||||
docker-compose up -d
|
# For development (with hot reloading)
|
||||||
|
docker-compose --profile dev up -d
|
||||||
|
|
||||||
|
# For production (optimized static files)
|
||||||
|
docker-compose --profile prod up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
4. **Wait for services to be ready** (about 30 seconds for MySQL initialization):
|
4. **Wait for services to be ready** (about 30 seconds for MySQL initialization):
|
||||||
@@ -79,10 +83,63 @@ membership/
|
|||||||
```
|
```
|
||||||
Press Ctrl+C when you see "Application startup complete"
|
Press Ctrl+C when you see "Application startup complete"
|
||||||
|
|
||||||
5. **Access the API**:
|
5. **Access the application**:
|
||||||
|
- Frontend: http://localhost:3500 (development) or http://localhost:8080 (production)
|
||||||
- API: http://localhost:8000
|
- API: http://localhost:8000
|
||||||
- API Documentation: http://localhost:8000/docs
|
- API Documentation: http://localhost:8000/docs
|
||||||
- Alternative Docs: http://localhost:8000/redoc
|
|
||||||
|
## Frontend Development vs Production
|
||||||
|
|
||||||
|
The frontend supports both development and production modes using Docker Compose profiles:
|
||||||
|
|
||||||
|
### Development Mode (Vite)
|
||||||
|
- Hot reloading and development features
|
||||||
|
- Access at: http://localhost:3500
|
||||||
|
- Start with: `docker-compose --profile dev up -d`
|
||||||
|
|
||||||
|
### Production Mode (Nginx)
|
||||||
|
- Optimized static files served by Nginx
|
||||||
|
- Access at: http://localhost:8080
|
||||||
|
- Start with: `docker-compose --profile prod up -d`
|
||||||
|
|
||||||
|
### Usage Examples
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Start all services in development mode
|
||||||
|
docker-compose --profile dev up -d
|
||||||
|
|
||||||
|
# Start all services in production mode
|
||||||
|
docker-compose --profile prod up -d
|
||||||
|
|
||||||
|
# Start only the frontend in development mode
|
||||||
|
docker-compose --profile dev up -d frontend
|
||||||
|
|
||||||
|
# Start only the frontend in production mode
|
||||||
|
docker-compose --profile prod up -d frontend-prod
|
||||||
|
|
||||||
|
# Stop all services
|
||||||
|
docker-compose down
|
||||||
|
|
||||||
|
# Check which services are running
|
||||||
|
docker-compose ps
|
||||||
|
```
|
||||||
|
|
||||||
|
### Profile Details
|
||||||
|
|
||||||
|
- **`dev` profile**: Includes the `frontend` service (Vite dev server)
|
||||||
|
- **`prod` profile**: Includes the `frontend-prod` service (Nginx)
|
||||||
|
- **Default**: No frontend service runs unless you specify a profile
|
||||||
|
|
||||||
|
### For Production Deployment
|
||||||
|
|
||||||
|
When deploying to production with Caddy:
|
||||||
|
|
||||||
|
1. Start services in production mode:
|
||||||
|
```bash
|
||||||
|
docker-compose --profile prod up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Configure Caddy to proxy to `localhost:8080` for the frontend and `localhost:6000` for the API
|
||||||
|
|
||||||
## Default Credentials
|
## Default Credentials
|
||||||
|
|
||||||
|
|||||||
@@ -44,12 +44,13 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: ./frontend
|
context: ./frontend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
target: development # Default to development
|
||||||
container_name: membership_frontend
|
container_name: membership_frontend
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
- VITE_HOST_CHECK=false
|
- VITE_HOST_CHECK=false
|
||||||
ports:
|
ports:
|
||||||
- "3500:3000" # Expose frontend to host
|
- "8050:3000" # Expose frontend to host
|
||||||
volumes:
|
volumes:
|
||||||
- ./frontend/src:/app/src
|
- ./frontend/src:/app/src
|
||||||
- ./frontend/public:/app/public
|
- ./frontend/public:/app/public
|
||||||
@@ -58,6 +59,24 @@ services:
|
|||||||
- backend
|
- backend
|
||||||
networks:
|
networks:
|
||||||
- membership_private # Access to backend on private network
|
- membership_private # Access to backend on private network
|
||||||
|
profiles:
|
||||||
|
- dev # Only run in development
|
||||||
|
|
||||||
|
frontend-prod:
|
||||||
|
build:
|
||||||
|
context: ./frontend
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
target: production
|
||||||
|
container_name: membership_frontend_prod
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "8050:80" # Nginx default port
|
||||||
|
depends_on:
|
||||||
|
- backend
|
||||||
|
networks:
|
||||||
|
- membership_private
|
||||||
|
profiles:
|
||||||
|
- prod # Only run in production
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
membership_private:
|
membership_private:
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
FROM node:18-alpine
|
# Multi-stage Dockerfile for development and production
|
||||||
|
FROM node:18-alpine AS base
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -11,8 +12,24 @@ RUN npm install
|
|||||||
# Copy application files
|
# Copy application files
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Expose port
|
# Development stage
|
||||||
|
FROM base AS development
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
|
|
||||||
# Start development server
|
|
||||||
CMD ["npm", "run", "dev"]
|
CMD ["npm", "run", "dev"]
|
||||||
|
|
||||||
|
# Production build stage
|
||||||
|
FROM base AS build
|
||||||
|
RUN npm run build
|
||||||
|
|
||||||
|
# Production stage with Nginx
|
||||||
|
FROM nginx:alpine AS production
|
||||||
|
|
||||||
|
# Copy built files from build stage
|
||||||
|
COPY --from=build /app/dist /usr/share/nginx/html
|
||||||
|
|
||||||
|
# Copy custom nginx configuration
|
||||||
|
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
|
|
||||||
|
EXPOSE 80
|
||||||
|
|
||||||
|
CMD ["nginx", "-g", "daemon off;"]
|
||||||
|
|||||||
36
frontend/nginx.conf
Normal file
36
frontend/nginx.conf
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name localhost;
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
index index.html;
|
||||||
|
|
||||||
|
# Handle client-side routing - serve index.html for all non-file requests
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Cache static assets
|
||||||
|
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
|
||||||
|
expires 1y;
|
||||||
|
add_header Cache-Control "public, immutable";
|
||||||
|
}
|
||||||
|
|
||||||
|
# Security headers
|
||||||
|
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||||
|
add_header X-Content-Type-Options "nosniff" always;
|
||||||
|
add_header X-XSS-Protection "1; mode=block" always;
|
||||||
|
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
|
||||||
|
|
||||||
|
# Gzip compression
|
||||||
|
gzip on;
|
||||||
|
gzip_vary on;
|
||||||
|
gzip_min_length 1024;
|
||||||
|
gzip_types
|
||||||
|
text/plain
|
||||||
|
text/css
|
||||||
|
text/xml
|
||||||
|
text/javascript
|
||||||
|
application/javascript
|
||||||
|
application/xml+rss
|
||||||
|
application/json;
|
||||||
|
}
|
||||||
@@ -112,7 +112,7 @@ const Dashboard: React.FC = () => {
|
|||||||
|
|
||||||
const handleUpdateUserRole = async (userId: number, newRole: string) => {
|
const handleUpdateUserRole = async (userId: number, newRole: string) => {
|
||||||
try {
|
try {
|
||||||
await userService.updateUserRole(userId, newRole);
|
await userService.updateUser(userId, { role: newRole });
|
||||||
// Reload data to reflect changes
|
// Reload data to reflect changes
|
||||||
await loadData();
|
await loadData();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export default defineConfig({
|
|||||||
host: true,
|
host: true,
|
||||||
port: 3000,
|
port: 3000,
|
||||||
strictPort: true,
|
strictPort: true,
|
||||||
allowedHosts: ['sasaprod', 'localhost'],
|
allowedHosts: ['sasaprod', 'localhost', 'members.sasalliance.org'],
|
||||||
watch: {
|
watch: {
|
||||||
usePolling: true
|
usePolling: true
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user