Skip to content

Conversation

@alokemajumder
Copy link
Collaborator

Summary

  • Resolved major merge conflicts in Docker configurations
  • Unified docker-compose.yml with best practices from both versions
  • Fixed Dockerfile configurations for API and worker services
  • Removed conflicting genai variant files

Changes

  • docker-compose.yml: Merged with Traefik v3.1, PostgreSQL 16, enhanced Redis config, and monitoring
  • docker/api/Dockerfile: Consolidated with Python 3.12.7 and psycopg2 fixes
  • docker/worker/Dockerfile: Unified CPU/GPU runtime stages
  • Cleaned up conflicting files (genai variants)

🤖 Generated with Claude Code

alokemajumder and others added 2 commits July 25, 2025 16:46
…ors guide

- Update all Dockerfiles with latest best practices:
  * Multi-stage builds for better security and performance
  * Specific package versions for reproducible builds
  * Non-root users with proper UID/GID
  * Tini as PID 1 for proper signal handling
  * Improved health checks and labels

- Modernize Docker Compose files:
  * Remove obsolete version field (Compose v2+)
  * Add project names and better organization
  * Update to latest stable image versions
  * Proper YAML environment variable format
  * Enhanced resource management and restart policies
  * Multi-platform build support (amd64/arm64)

- Add comprehensive .dockerignore for optimized build context

- Create detailed CONTRIBUTING.md with:
  * Guidelines for developers, video engineers, and FFmpeg experts
  * Complete project architecture documentation
  * FFmpeg integration best practices
  * API development patterns and testing
  * Performance optimization strategies
  * Security considerations and deployment guides
  * Learning resources and community guidelines

- Update Docker commands throughout to use 'docker compose' (v2)

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
@alokemajumder alokemajumder enabled auto-merge July 26, 2025 05:17
@alokemajumder alokemajumder requested a review from AnkanSaha July 26, 2025 05:17
@alokemajumder alokemajumder merged commit 8c2e1a6 into main Jul 26, 2025
2 checks passed
@alokemajumder alokemajumder deleted the fix-merge-conflicts branch July 27, 2025 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants