Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1d4e79a4f9 | |||
| 0b0e3e22d2 | |||
| f22e3c133f | |||
| 64c0a58f78 |
@@ -0,0 +1,134 @@
|
||||
# Traefik Troubleshooting Guide
|
||||
|
||||
## Common Issues and Solutions
|
||||
|
||||
### 1. 404 Errors on API Routes
|
||||
|
||||
**Problem**: Getting 404 errors when accessing `/api/*` routes
|
||||
|
||||
**Causes**:
|
||||
- Traefik routing rules not properly configured
|
||||
- Backend container not healthy
|
||||
- Path stripping not working correctly
|
||||
|
||||
**Solutions**:
|
||||
|
||||
1. **Check container health**:
|
||||
```bash
|
||||
docker ps # Check if backend is running
|
||||
docker logs picpeak-backend # Check for startup errors
|
||||
```
|
||||
|
||||
2. **Test backend directly**:
|
||||
```bash
|
||||
# Access backend container
|
||||
docker exec -it picpeak-backend sh
|
||||
|
||||
# Test health endpoint
|
||||
wget -O- http://localhost:3000/health
|
||||
|
||||
# Test public settings endpoint
|
||||
wget -O- http://localhost:3000/public/settings
|
||||
```
|
||||
|
||||
3. **Check Traefik routing**:
|
||||
```bash
|
||||
# Check if routes are registered in Traefik
|
||||
curl https://traefik.yourdomain.com/api/http/routers | jq '.[] | select(.rule | contains("picpeak"))'
|
||||
```
|
||||
|
||||
### 2. Backend Not Accessible Through Traefik
|
||||
|
||||
**Key Configuration Points**:
|
||||
|
||||
1. **Traefik Labels** (in deploy section):
|
||||
- `traefik.enable=true` - Enable Traefik for this container
|
||||
- `traefik.docker.network=proxy` - Specify which network Traefik should use
|
||||
- `traefik.http.routers.picpeak-backend.priority=100` - Higher priority for API routes
|
||||
|
||||
2. **Path Stripping**:
|
||||
- Frontend expects `/api/*` but backend serves routes without `/api` prefix
|
||||
- Middleware strips `/api` before forwarding to backend
|
||||
|
||||
3. **Network Configuration**:
|
||||
- Backend must be in both `picpeak` (internal) and `proxy` (Traefik) networks
|
||||
|
||||
### 3. Environment Variable Issues
|
||||
|
||||
**Critical Variables**:
|
||||
- `ADMIN_URL` and `FRONTEND_URL` must match your actual domain
|
||||
- These affect CORS configuration
|
||||
|
||||
**Example .env**:
|
||||
```env
|
||||
# URLs
|
||||
ADMIN_URL=https://picpeak.local.nothaft.cloud
|
||||
FRONTEND_URL=https://picpeak.local.nothaft.cloud
|
||||
|
||||
# Database
|
||||
DB_USER=picpeak
|
||||
DB_PASSWORD=your_secure_password
|
||||
DB_NAME=picpeak
|
||||
|
||||
# JWT
|
||||
JWT_SECRET=your_secure_jwt_secret
|
||||
|
||||
# Email (optional)
|
||||
SMTP_HOST=smtp.example.com
|
||||
SMTP_PORT=587
|
||||
SMTP_SECURE=true
|
||||
SMTP_USER=noreply@example.com
|
||||
SMTP_PASS=smtp_password
|
||||
EMAIL_FROM=noreply@example.com
|
||||
```
|
||||
|
||||
### 4. Debugging Steps
|
||||
|
||||
1. **Check if backend is receiving requests**:
|
||||
```bash
|
||||
# Watch backend logs
|
||||
docker logs -f picpeak-backend
|
||||
|
||||
# Look for incoming requests when you try to access the admin page
|
||||
```
|
||||
|
||||
2. **Test API routes directly**:
|
||||
```bash
|
||||
# From outside
|
||||
curl -v https://picpeak.local.nothaft.cloud/api/public/settings
|
||||
|
||||
# Should see backend logs if request reaches container
|
||||
```
|
||||
|
||||
3. **Verify Traefik middleware**:
|
||||
```bash
|
||||
# Check if stripprefix middleware exists
|
||||
curl https://traefik.yourdomain.com/api/http/middlewares | jq '.[] | select(.name | contains("picpeak"))'
|
||||
```
|
||||
|
||||
### 5. Quick Fix Checklist
|
||||
|
||||
- [ ] Backend container is healthy (`docker ps`)
|
||||
- [ ] Backend is in both networks (`docker inspect picpeak-backend | grep -A 20 Networks`)
|
||||
- [ ] Traefik labels use correct network (`traefik.docker.network=proxy`)
|
||||
- [ ] Priority is set correctly (backend: 100, frontend: 10)
|
||||
- [ ] ADMIN_URL and FRONTEND_URL match your domain
|
||||
- [ ] Database is accessible from backend
|
||||
- [ ] Migrations have run successfully
|
||||
|
||||
### 6. Alternative Testing
|
||||
|
||||
If Traefik routing is problematic, test backend directly:
|
||||
|
||||
```bash
|
||||
# Port forward to test backend directly
|
||||
docker run --rm -it --network picpeak alpine/curl curl http://backend:3000/health
|
||||
|
||||
# Or expose backend port temporarily
|
||||
docker run -d --name picpeak-backend-test \
|
||||
--network picpeak \
|
||||
-p 3001:3000 \
|
||||
registry.local.nothaft.cloud/picpeak-backend:latest
|
||||
```
|
||||
|
||||
Then access http://localhost:3001/health to verify backend is working.
|
||||
@@ -0,0 +1,35 @@
|
||||
exports.up = async function(knex) {
|
||||
// Check current column structure
|
||||
const hasSubjectEn = await knex.schema.hasColumn('email_templates', 'subject_en');
|
||||
const hasSubject = await knex.schema.hasColumn('email_templates', 'subject');
|
||||
|
||||
if (hasSubjectEn && !hasSubject) {
|
||||
// The language migration was applied, need to add back basic columns
|
||||
await knex.schema.alterTable('email_templates', function(table) {
|
||||
table.string('subject');
|
||||
table.text('body_html');
|
||||
table.text('body_text');
|
||||
});
|
||||
|
||||
// Copy English values to the basic columns
|
||||
await knex('email_templates').update({
|
||||
subject: knex.raw('subject_en'),
|
||||
body_html: knex.raw('body_html_en'),
|
||||
body_text: knex.raw('body_text_en')
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
exports.down = async function(knex) {
|
||||
// Check if we have the basic columns
|
||||
const hasSubject = await knex.schema.hasColumn('email_templates', 'subject');
|
||||
const hasSubjectEn = await knex.schema.hasColumn('email_templates', 'subject_en');
|
||||
|
||||
if (hasSubject && hasSubjectEn) {
|
||||
await knex.schema.alterTable('email_templates', function(table) {
|
||||
table.dropColumn('subject');
|
||||
table.dropColumn('body_html');
|
||||
table.dropColumn('body_text');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,91 @@
|
||||
exports.up = async function(knex) {
|
||||
// Check if we have the default email templates
|
||||
const templates = await knex('email_templates').select('template_key');
|
||||
const existingKeys = templates.map(t => t.template_key);
|
||||
|
||||
// Check which columns exist in the table
|
||||
const hasSubjectEn = await knex.schema.hasColumn('email_templates', 'subject_en');
|
||||
const hasSubject = await knex.schema.hasColumn('email_templates', 'subject');
|
||||
|
||||
// Determine which columns to use based on schema
|
||||
const subjectCol = hasSubjectEn ? 'subject_en' : 'subject';
|
||||
const bodyHtmlCol = hasSubjectEn ? 'body_html_en' : 'body_html';
|
||||
const bodyTextCol = hasSubjectEn ? 'body_text_en' : 'body_text';
|
||||
|
||||
const defaultTemplates = [
|
||||
{
|
||||
template_key: 'gallery_created',
|
||||
[subjectCol]: 'Your Photo Gallery is Ready!',
|
||||
[bodyHtmlCol]: `<h2>Gallery Created Successfully</h2>
|
||||
<p>Dear {{host_name}},</p>
|
||||
<p>Your photo gallery "{{event_name}}" has been created successfully!</p>
|
||||
<p><strong>Gallery Details:</strong></p>
|
||||
<ul>
|
||||
<li>Event Date: {{event_date}}</li>
|
||||
<li>Gallery Link: {{gallery_link}}</li>
|
||||
<li>Password: {{gallery_password}}</li>
|
||||
<li>Expires: {{expiry_date}}</li>
|
||||
</ul>
|
||||
<p>Share this link and password with your guests to allow them to view and download photos.</p>`,
|
||||
[bodyTextCol]: 'Gallery Created Successfully\n\nDear {{host_name}},\n\nYour photo gallery "{{event_name}}" has been created successfully!',
|
||||
variables: JSON.stringify(['host_name', 'event_name', 'event_date', 'gallery_link', 'gallery_password', 'expiry_date'])
|
||||
},
|
||||
{
|
||||
template_key: 'expiration_warning',
|
||||
[subjectCol]: 'Your Photo Gallery Expires Soon',
|
||||
[bodyHtmlCol]: `<h2>Gallery Expiring Soon</h2>
|
||||
<p>Dear {{host_name}},</p>
|
||||
<p>Your photo gallery "{{event_name}}" will expire in {{days_remaining}} days.</p>
|
||||
<p>After expiration, the gallery will be archived and no longer accessible to guests.</p>
|
||||
<p><a href="{{gallery_link}}">Visit Gallery</a></p>`,
|
||||
[bodyTextCol]: 'Gallery Expiring Soon\n\nDear {{host_name}},\n\nYour photo gallery "{{event_name}}" will expire in {{days_remaining}} days.',
|
||||
variables: JSON.stringify(['host_name', 'event_name', 'days_remaining', 'gallery_link'])
|
||||
},
|
||||
{
|
||||
template_key: 'gallery_expired',
|
||||
[subjectCol]: 'Your Photo Gallery Has Expired',
|
||||
[bodyHtmlCol]: `<h2>Gallery Expired</h2>
|
||||
<p>Dear {{host_name}},</p>
|
||||
<p>Your photo gallery "{{event_name}}" has expired and been archived.</p>
|
||||
<p>The photos are safely stored in our archive system. If you need access to the archived photos, please contact support.</p>`,
|
||||
[bodyTextCol]: 'Gallery Expired\n\nDear {{host_name}},\n\nYour photo gallery "{{event_name}}" has expired and been archived.',
|
||||
variables: JSON.stringify(['host_name', 'event_name'])
|
||||
},
|
||||
{
|
||||
template_key: 'archive_complete',
|
||||
[subjectCol]: 'Gallery Archive Complete',
|
||||
[bodyHtmlCol]: `<h2>Archive Complete</h2>
|
||||
<p>Dear {{host_name}},</p>
|
||||
<p>Your photo gallery "{{event_name}}" has been successfully archived.</p>
|
||||
<p>Archive size: {{archive_size}}</p>
|
||||
<p>The archive is stored securely and can be retrieved if needed.</p>`,
|
||||
[bodyTextCol]: 'Archive Complete\n\nDear {{host_name}},\n\nYour photo gallery "{{event_name}}" has been successfully archived.',
|
||||
variables: JSON.stringify(['host_name', 'event_name', 'archive_size'])
|
||||
}
|
||||
];
|
||||
|
||||
// Insert missing templates
|
||||
for (const template of defaultTemplates) {
|
||||
if (!existingKeys.includes(template.template_key)) {
|
||||
// If we have language columns, also set German versions with same content
|
||||
if (hasSubjectEn) {
|
||||
template.subject_de = template[subjectCol];
|
||||
template.body_html_de = template[bodyHtmlCol];
|
||||
template.body_text_de = template[bodyTextCol];
|
||||
|
||||
// Also ensure we have the basic columns if they exist
|
||||
if (hasSubject) {
|
||||
template.subject = template[subjectCol];
|
||||
template.body_html = template[bodyHtmlCol];
|
||||
template.body_text = template[bodyTextCol];
|
||||
}
|
||||
}
|
||||
|
||||
await knex('email_templates').insert(template);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
exports.down = async function(knex) {
|
||||
// Don't remove templates on rollback as they might have been customized
|
||||
};
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.0.14",
|
||||
"version": "1.0.16",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.0.14",
|
||||
"version": "1.0.16",
|
||||
"dependencies": {
|
||||
"adm-zip": "^0.5.16",
|
||||
"archiver": "^5.3.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.0.14",
|
||||
"version": "1.0.16",
|
||||
"description": "Backend for PicPeak event photo sharing platform",
|
||||
"main": "server.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
require('dotenv').config();
|
||||
const { db } = require('../src/database/db');
|
||||
|
||||
async function checkDatabaseIssues() {
|
||||
console.log('Checking database issues...\n');
|
||||
|
||||
try {
|
||||
// Check email_templates table structure
|
||||
console.log('1. Checking email_templates table structure:');
|
||||
const emailTemplateColumns = await db('email_templates').columnInfo();
|
||||
console.log('Columns:', Object.keys(emailTemplateColumns));
|
||||
|
||||
// Check if any templates exist
|
||||
const templateCount = await db('email_templates').count('* as count');
|
||||
console.log('Template count:', templateCount[0].count);
|
||||
|
||||
// Check for specific template
|
||||
const galleryCreatedTemplate = await db('email_templates')
|
||||
.where('template_key', 'gallery_created')
|
||||
.first();
|
||||
console.log('gallery_created template exists:', !!galleryCreatedTemplate);
|
||||
|
||||
// Check activity_logs table
|
||||
console.log('\n2. Checking activity_logs table:');
|
||||
const activityLogColumns = await db('activity_logs').columnInfo();
|
||||
console.log('Columns:', Object.keys(activityLogColumns));
|
||||
|
||||
// Check migrations table
|
||||
console.log('\n3. Checking migrations status:');
|
||||
const migrations = await db('migrations')
|
||||
.orderBy('id', 'desc')
|
||||
.limit(10);
|
||||
console.log('Latest migrations:');
|
||||
migrations.forEach(m => console.log(` - ${m.filename}`));
|
||||
|
||||
// Test a simple query from notifications route
|
||||
console.log('\n4. Testing notifications query:');
|
||||
try {
|
||||
const notifications = await db('activity_logs')
|
||||
.select(
|
||||
'activity_logs.*',
|
||||
'events.event_name'
|
||||
)
|
||||
.leftJoin('events', 'activity_logs.event_id', 'events.id')
|
||||
.orderBy('activity_logs.created_at', 'desc')
|
||||
.limit(5);
|
||||
console.log(`Found ${notifications.length} notifications`);
|
||||
} catch (error) {
|
||||
console.error('Notifications query failed:', error.message);
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error:', error);
|
||||
} finally {
|
||||
await db.destroy();
|
||||
process.exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
checkDatabaseIssues();
|
||||
@@ -193,20 +193,34 @@ router.get('/templates/:key', adminAuth, async (req, res) => {
|
||||
return res.status(404).json({ error: 'Template not found' });
|
||||
}
|
||||
|
||||
res.json({
|
||||
// Handle both old and new schema formats
|
||||
const response = {
|
||||
id: template.id,
|
||||
template_key: template.template_key,
|
||||
// English versions
|
||||
subject_en: template.subject_en || template.subject,
|
||||
body_html_en: template.body_html_en || template.body_html,
|
||||
body_text_en: template.body_text_en || template.body_text,
|
||||
// German versions
|
||||
subject_de: template.subject_de || template.subject_en || template.subject,
|
||||
body_html_de: template.body_html_de || template.body_html_en || template.body_html,
|
||||
body_text_de: template.body_text_de || template.body_text_en || template.body_text,
|
||||
variables: template.variables ? JSON.parse(template.variables) : [],
|
||||
updated_at: template.updated_at
|
||||
});
|
||||
};
|
||||
|
||||
// Check which columns exist and use them appropriately
|
||||
if (template.subject_en !== undefined) {
|
||||
// New schema with language columns
|
||||
response.subject_en = template.subject_en;
|
||||
response.body_html_en = template.body_html_en;
|
||||
response.body_text_en = template.body_text_en;
|
||||
response.subject_de = template.subject_de;
|
||||
response.body_html_de = template.body_html_de;
|
||||
response.body_text_de = template.body_text_de;
|
||||
} else {
|
||||
// Old schema - use basic columns for both languages
|
||||
response.subject_en = template.subject;
|
||||
response.body_html_en = template.body_html;
|
||||
response.body_text_en = template.body_text;
|
||||
response.subject_de = template.subject;
|
||||
response.body_html_de = template.body_html;
|
||||
response.body_text_de = template.body_text;
|
||||
}
|
||||
|
||||
res.json(response);
|
||||
} catch (error) {
|
||||
console.error('Email template fetch error:', error);
|
||||
res.status(500).json({ error: 'Failed to fetch email template' });
|
||||
@@ -237,13 +251,39 @@ router.put('/templates/:key', [
|
||||
updated_at: new Date()
|
||||
};
|
||||
|
||||
// Only update provided fields
|
||||
if (subject_en !== undefined) updateData.subject_en = subject_en;
|
||||
if (subject_de !== undefined) updateData.subject_de = subject_de;
|
||||
if (body_html_en !== undefined) updateData.body_html_en = body_html_en;
|
||||
if (body_html_de !== undefined) updateData.body_html_de = body_html_de;
|
||||
if (body_text_en !== undefined) updateData.body_text_en = body_text_en || '';
|
||||
if (body_text_de !== undefined) updateData.body_text_de = body_text_de || '';
|
||||
// Check which columns exist in the database
|
||||
const template = await db('email_templates')
|
||||
.where('template_key', req.params.key)
|
||||
.first();
|
||||
|
||||
if (!template) {
|
||||
return res.status(404).json({ error: 'Template not found' });
|
||||
}
|
||||
|
||||
// Determine schema type and update accordingly
|
||||
if (template.subject_en !== undefined) {
|
||||
// New schema with language columns
|
||||
if (subject_en !== undefined) updateData.subject_en = subject_en;
|
||||
if (subject_de !== undefined) updateData.subject_de = subject_de;
|
||||
if (body_html_en !== undefined) updateData.body_html_en = body_html_en;
|
||||
if (body_html_de !== undefined) updateData.body_html_de = body_html_de;
|
||||
if (body_text_en !== undefined) updateData.body_text_en = body_text_en || '';
|
||||
if (body_text_de !== undefined) updateData.body_text_de = body_text_de || '';
|
||||
|
||||
// Also update basic columns if they exist
|
||||
if (template.subject !== undefined) {
|
||||
updateData.subject = subject_en || updateData.subject_en;
|
||||
updateData.body_html = body_html_en || updateData.body_html_en;
|
||||
updateData.body_text = body_text_en || updateData.body_text_en || '';
|
||||
}
|
||||
} else {
|
||||
// Old schema - only update basic columns
|
||||
if (subject_en !== undefined) {
|
||||
updateData.subject = subject_en;
|
||||
updateData.body_html = body_html_en;
|
||||
updateData.body_text = body_text_en || '';
|
||||
}
|
||||
}
|
||||
|
||||
const updated = await db('email_templates')
|
||||
.where('template_key', req.params.key)
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
version: '3.8'
|
||||
services:
|
||||
backend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-backend:latest'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- DATABASE_CLIENT=pg
|
||||
- DB_HOST=db
|
||||
- DB_PORT=5432
|
||||
- DB_USER=${DB_USER:-picpeak}
|
||||
- DB_PASSWORD=${DB_PASSWORD}
|
||||
- DB_NAME=${DB_NAME:-picpeak}
|
||||
- PORT=3000
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- ADMIN_URL=https://picpeak.local.nothaft.cloud
|
||||
- FRONTEND_URL=https://picpeak.local.nothaft.cloud
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT}
|
||||
- SMTP_SECURE=${SMTP_SECURE}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASS=${SMTP_PASS}
|
||||
- EMAIL_FROM=${EMAIL_FROM}
|
||||
- UMAMI_URL=${UMAMI_URL}
|
||||
- UMAMI_WEBSITE_ID=${UMAMI_WEBSITE_ID}
|
||||
- STORAGE_PATH=/app/storage
|
||||
- EVENTS_PATH=/app/storage/events
|
||||
- ARCHIVE_PATH=/app/storage/events/archived
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/storage:/app/storage'
|
||||
- '/mnt/DockerMount/picpeak/data:/app/data'
|
||||
- '/mnt/DockerMount/picpeak/logs:/app/logs'
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
# Backend API routing WITHOUT path stripping
|
||||
- 'traefik.http.routers.picpeak-backend.rule=(Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)) && PathPrefix(`/api`)'
|
||||
- traefik.http.routers.picpeak-backend.entrypoints=https
|
||||
- traefik.http.routers.picpeak-backend.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak-backend.loadbalancer.server.port=3000
|
||||
# Remove the stripprefix middleware - backend expects /api prefix
|
||||
# - traefik.http.middlewares.picpeak-stripprefix.stripprefix.prefixes=/api
|
||||
# - traefik.http.routers.picpeak-backend.middlewares=picpeak-stripprefix
|
||||
- traefik.http.routers.picpeak-backend.priority=100
|
||||
- homepage.group=Public Services
|
||||
- homepage.name=PicPeak Backend
|
||||
- homepage.icon=mdi-api
|
||||
- 'homepage.href=https://picpeak.local.nothaft.cloud/api/health'
|
||||
- homepage.description=PicPeak API Backend
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
depends_on:
|
||||
- db
|
||||
|
||||
frontend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-frontend:latest'
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
- traefik.http.routers.picpeak.rule=Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)
|
||||
- traefik.http.routers.picpeak.entrypoints=https
|
||||
- traefik.http.routers.picpeak.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak.loadbalancer.server.port=80
|
||||
- traefik.http.routers.picpeak.priority=10
|
||||
- homepage.group=Public Services
|
||||
- homepage.name=PicPeak
|
||||
- homepage.icon=mdi-photo
|
||||
- 'homepage.href=https://picpeak.local.nothaft.cloud/'
|
||||
- homepage.description=Photo Sharing System
|
||||
|
||||
db:
|
||||
image: 'postgres:14-alpine'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_USER=${DB_USER:-picpeak}
|
||||
- POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
- POSTGRES_DB=${DB_NAME:-picpeak}
|
||||
- POSTGRES_HOST_AUTH_METHOD=${PG_AUTH_METHOD:-scram-sha-256}
|
||||
- POSTGRES_INITDB_ARGS=${PG_INIT_ARGS:---auth-host=scram-sha-256 --auth-local=trust}
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/db:/var/lib/postgresql/data'
|
||||
networks:
|
||||
- picpeak
|
||||
command: ${PG_COMMANDS:-postgres -c ssl=off}
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-picpeak}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
picpeak:
|
||||
driver: bridge
|
||||
@@ -0,0 +1,131 @@
|
||||
version: '3.8'
|
||||
services:
|
||||
backend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-backend:latest'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- NODE_ENV=production
|
||||
- DATABASE_CLIENT=pg
|
||||
- DB_HOST=db
|
||||
- DB_PORT=5432
|
||||
- DB_USER=${DB_USER:-picpeak}
|
||||
- DB_PASSWORD=${DB_PASSWORD}
|
||||
- DB_NAME=${DB_NAME:-picpeak}
|
||||
- PORT=3000
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- ADMIN_URL=https://picpeak.local.nothaft.cloud
|
||||
- FRONTEND_URL=https://picpeak.local.nothaft.cloud
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT}
|
||||
- SMTP_SECURE=${SMTP_SECURE}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASS=${SMTP_PASS}
|
||||
- EMAIL_FROM=${EMAIL_FROM}
|
||||
- UMAMI_URL=${UMAMI_URL}
|
||||
- UMAMI_WEBSITE_ID=${UMAMI_WEBSITE_ID}
|
||||
- STORAGE_PATH=/app/storage
|
||||
- EVENTS_PATH=/app/storage/events
|
||||
- ARCHIVE_PATH=/app/storage/events/archived
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/storage:/app/storage'
|
||||
- '/mnt/DockerMount/picpeak/data:/app/data'
|
||||
- '/mnt/DockerMount/picpeak/logs:/app/logs'
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
# Backend API routing
|
||||
- 'traefik.http.routers.picpeak-backend.rule=(Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)) && PathPrefix(`/api`)'
|
||||
- traefik.http.routers.picpeak-backend.entrypoints=https
|
||||
- traefik.http.routers.picpeak-backend.tls=true
|
||||
- traefik.http.routers.picpeak-backend.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak-backend.loadbalancer.server.port=3000
|
||||
# Strip /api prefix when forwarding to backend
|
||||
- traefik.http.middlewares.picpeak-stripprefix.stripprefix.prefixes=/api
|
||||
- traefik.http.routers.picpeak-backend.middlewares=picpeak-stripprefix
|
||||
# Higher priority for API routes
|
||||
- traefik.http.routers.picpeak-backend.priority=100
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000/health"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
depends_on:
|
||||
- db
|
||||
|
||||
frontend:
|
||||
image: 'registry.local.nothaft.cloud/picpeak-frontend:latest'
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
# Frontend routing (catch-all for non-API routes)
|
||||
- traefik.http.routers.picpeak.rule=Host(`picpeak.nothaft.cloud`) || Host(`picpeak.local.nothaft.cloud`)
|
||||
- traefik.http.routers.picpeak.entrypoints=https
|
||||
- traefik.http.routers.picpeak.tls=true
|
||||
- traefik.http.routers.picpeak.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak.loadbalancer.server.port=80
|
||||
# Lower priority than backend to ensure /api routes go to backend
|
||||
- traefik.http.routers.picpeak.priority=10
|
||||
|
||||
db:
|
||||
image: 'postgres:14-alpine'
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- POSTGRES_USER=${DB_USER:-picpeak}
|
||||
- POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
- POSTGRES_DB=${DB_NAME:-picpeak}
|
||||
- POSTGRES_HOST_AUTH_METHOD=scram-sha-256
|
||||
- POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256 --auth-local=trust
|
||||
volumes:
|
||||
- '/mnt/DockerMount/picpeak/db:/var/lib/postgresql/data'
|
||||
# Mount init script to create umami database
|
||||
- ./docker/postgres-init:/docker-entrypoint-initdb.d:ro
|
||||
networks:
|
||||
- picpeak
|
||||
command: postgres -c ssl=off
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-picpeak}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
# Optional: Umami analytics
|
||||
umami:
|
||||
image: ghcr.io/umami-software/umami:postgresql-latest
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
DATABASE_URL: postgresql://${DB_USER:-picpeak}:${DB_PASSWORD}@db:5432/umami
|
||||
DATABASE_TYPE: postgresql
|
||||
HASH_SALT: ${UMAMI_HASH_SALT}
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
networks:
|
||||
- picpeak
|
||||
- proxy
|
||||
deploy:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.docker.network=proxy
|
||||
- traefik.http.routers.picpeak-umami.rule=Host(`analytics.picpeak.local.nothaft.cloud`)
|
||||
- traefik.http.routers.picpeak-umami.entrypoints=https
|
||||
- traefik.http.routers.picpeak-umami.tls=true
|
||||
- traefik.http.routers.picpeak-umami.tls.certresolver=dns
|
||||
- traefik.http.services.picpeak-umami.loadbalancer.server.port=3000
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
picpeak:
|
||||
driver: bridge
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "picpeak-frontend",
|
||||
"version": "1.0.14",
|
||||
"version": "1.0.16",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "picpeak-frontend",
|
||||
"version": "1.0.14",
|
||||
"version": "1.0.16",
|
||||
"dependencies": {
|
||||
"@tanstack/react-query": "^5.0.0",
|
||||
"@tiptap/extension-link": "^2.25.0",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "picpeak-frontend",
|
||||
"private": true,
|
||||
"version": "1.0.14",
|
||||
"version": "1.0.16",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
Reference in New Issue
Block a user