feat(03-02): add Docker Compose postgres profiles and build-tagged test helper
- compose.yml: add postgres service with profiles, healthcheck, pg_isready - compose.yml: add DATABASE_URL env var and conditional depends_on (required: false) - compose.yml: add postgres-data volume; default deploy remains SQLite-only - compose.dev.yml: add postgres service with port 5432 exposed for local dev - compose.dev.yml: add DATABASE_URL env var and conditional depends_on - pkg/diunwebhook/postgres_test.go: build-tagged NewTestPostgresServer helper
This commit is contained in:
@@ -5,4 +5,32 @@ services:
|
|||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
environment:
|
environment:
|
||||||
- WEBHOOK_SECRET=${WEBHOOK_SECRET:-}
|
- WEBHOOK_SECRET=${WEBHOOK_SECRET:-}
|
||||||
|
- DATABASE_URL=${DATABASE_URL:-}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
required: false
|
||||||
|
|
||||||
|
postgres:
|
||||||
|
image: postgres:17-alpine
|
||||||
|
profiles:
|
||||||
|
- postgres
|
||||||
|
ports:
|
||||||
|
- "5432:5432"
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: ${POSTGRES_USER:-diun}
|
||||||
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-diun}
|
||||||
|
POSTGRES_DB: ${POSTGRES_DB:-diundashboard}
|
||||||
|
volumes:
|
||||||
|
- postgres-data:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-diun}"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 10s
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
postgres-data:
|
||||||
|
|||||||
25
compose.yml
25
compose.yml
@@ -1,3 +1,4 @@
|
|||||||
|
# Minimum Docker Compose v2.20 required for depends_on.required
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: gitea.jeanlucmakiola.de/makiolaj/diundashboard:latest
|
image: gitea.jeanlucmakiola.de/makiolaj/diundashboard:latest
|
||||||
@@ -7,9 +8,33 @@ services:
|
|||||||
- WEBHOOK_SECRET=${WEBHOOK_SECRET:-}
|
- WEBHOOK_SECRET=${WEBHOOK_SECRET:-}
|
||||||
- PORT=${PORT:-8080}
|
- PORT=${PORT:-8080}
|
||||||
- DB_PATH=/data/diun.db
|
- DB_PATH=/data/diun.db
|
||||||
|
- DATABASE_URL=${DATABASE_URL:-}
|
||||||
volumes:
|
volumes:
|
||||||
- diun-data:/data
|
- diun-data:/data
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
required: false
|
||||||
|
|
||||||
|
postgres:
|
||||||
|
image: postgres:17-alpine
|
||||||
|
profiles:
|
||||||
|
- postgres
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: ${POSTGRES_USER:-diun}
|
||||||
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-diun}
|
||||||
|
POSTGRES_DB: ${POSTGRES_DB:-diundashboard}
|
||||||
|
volumes:
|
||||||
|
- postgres-data:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-diun}"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 10s
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
diun-data:
|
diun-data:
|
||||||
|
postgres-data:
|
||||||
|
|||||||
29
pkg/diunwebhook/postgres_test.go
Normal file
29
pkg/diunwebhook/postgres_test.go
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
//go:build postgres
|
||||||
|
|
||||||
|
package diunwebhook
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
_ "github.com/jackc/pgx/v5/stdlib"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NewTestPostgresServer constructs a Server backed by a PostgreSQL database.
|
||||||
|
// Requires a running PostgreSQL instance. Set TEST_DATABASE_URL to override
|
||||||
|
// the default connection string.
|
||||||
|
func NewTestPostgresServer() (*Server, error) {
|
||||||
|
databaseURL := os.Getenv("TEST_DATABASE_URL")
|
||||||
|
if databaseURL == "" {
|
||||||
|
databaseURL = "postgres://diun:diun@localhost:5432/diundashboard_test?sslmode=disable"
|
||||||
|
}
|
||||||
|
db, err := sql.Open("pgx", databaseURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := RunPostgresMigrations(db); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
store := NewPostgresStore(db)
|
||||||
|
return NewServer(store, ""), nil
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user