Develop

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, develop ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, develop ]
 
 jobs:
   test:

.github/workflows/publish.yml

@@ -2,7 +2,7 @@ name: Docker Publish
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "develop" ]
     tags: [ "v*" ]
 
 env:

Dockerfile

@@ -11,7 +11,6 @@ WORKDIR /app
 RUN apk add --no-cache ca-certificates tzdata wget
 COPY --from=builder /capy-server .
 COPY --from=builder /app/docs ./docs
-COPY --from=builder /app/schema.sql ./schema.sql
 COPY --from=builder /app/migrations ./migrations
 RUN adduser -D -g '' appuser
 USER appuser

Makefile

@@ -37,6 +37,12 @@ migrate-version:
 	test -n "$$db_url" || (echo "Set MIGRATE_DATABASE_URL or DATABASE_URL (or add DATABASE_URL to .env)" && exit 1); \
 	docker run --rm --network $(COMPOSE_NETWORK) -v "$(CURDIR)/$(MIGRATIONS_DIR):/migrations" $(MIGRATE_DOCKER_IMAGE) -path /migrations -database "$$db_url" version
 
+migrate-force:
+	@test -n "$(version)" || (echo "Usage: make migrate-version version=20260327180817" && exit 1)
+	@db_url="$${MIGRATE_DATABASE_URL:-$${DATABASE_URL:-$$(grep -E '^DATABASE_URL=' .env 2>/dev/null | head -n1 | cut -d= -f2-)}}"; \
+	test -n "$$db_url" || (echo "Set MIGRATE_DATABASE_URL or DATABASE_URL (or add DATABASE_URL to .env)" && exit 1); \
+	docker run --rm --network $(COMPOSE_NETWORK) -v "$(CURDIR)/$(MIGRATIONS_DIR):/migrations" $(MIGRATE_DOCKER_IMAGE) -path /migrations -database "$$db_url" force $(version)
+
 # Build
 build: generate
 	go build -o bin/capy-server ./cmd/server

cmd/server/main.go

@@ -40,7 +40,11 @@ import (
 // @name X-Bot-Token
 func main() {
 	// Setup structured logging
-	slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, nil)))
+	level := slog.LevelInfo
+	if os.Getenv("ENV") == "development" || os.Getenv("ENV") == "staging" || os.Getenv("ENV") == "" {
+		level = slog.LevelDebug
+	}
+	slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})))
 
 	// Load configuration
 	cfg, err := config.Load()

docker-compose.yml

@@ -25,14 +25,5 @@ services:
       db:
         condition: service_healthy
 
-  tunnel:
-    image: cloudflare/cloudflared:latest
-    restart: unless-stopped
-    command: tunnel run
-    env_file:
-      - .env
-    depends_on:
-      - api
-
 volumes:
   pgdata: