mirror of
https://github.com/dograh-hq/dograh.git
synced 2026-06-10 08:05:22 +02:00
chore: remove pipecat version check from docker build process
This commit is contained in:
parent
c7e75819f4
commit
d55205fd67
7 changed files with 181 additions and 103 deletions
|
|
@ -2,89 +2,21 @@
|
|||
#
|
||||
# check_pipecat_sync.sh
|
||||
#
|
||||
# Verifies that the pipecat submodule commit SHA matches the one in Dockerfile.
|
||||
# Used by CI/CD to ensure versions are synchronized before merging.
|
||||
# Exit code 0 = versions match, 1 = mismatch or error
|
||||
# DEPRECATED: This script is no longer needed as pipecat version is now
|
||||
# automatically synchronized during Docker build using build arguments.
|
||||
#
|
||||
# The Dockerfile now accepts PIPECAT_COMMIT as a build argument, and the
|
||||
# GitHub workflow automatically extracts and passes the correct commit SHA.
|
||||
#
|
||||
# For local development, use scripts/docker-build-local.sh or set the
|
||||
# PIPECAT_COMMIT environment variable before running docker-compose build.
|
||||
#
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Colors for output (work in both terminal and CI)
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
BLUE='\033[0;34m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
# Get the directory where this script is located
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||
|
||||
echo "🔍 Checking pipecat version synchronization..."
|
||||
|
||||
# Check if pipecat submodule exists
|
||||
if [ ! -d "$PROJECT_ROOT/pipecat" ]; then
|
||||
echo -e "${RED}❌ ERROR: pipecat submodule not found at $PROJECT_ROOT/pipecat${NC}"
|
||||
echo "Please run: git submodule update --init --recursive"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Get the commit from the submodule (use short form - 7 chars)
|
||||
cd "$PROJECT_ROOT/pipecat"
|
||||
SUBMODULE_COMMIT=$(git rev-parse HEAD)
|
||||
SUBMODULE_SHORT=$(git rev-parse --short=7 HEAD)
|
||||
|
||||
echo "📦 Submodule commit: $SUBMODULE_SHORT"
|
||||
|
||||
# Check if Dockerfile exists
|
||||
DOCKERFILE="$PROJECT_ROOT/api/Dockerfile"
|
||||
if [ ! -f "$DOCKERFILE" ]; then
|
||||
echo -e "${RED}❌ ERROR: Dockerfile not found at $DOCKERFILE${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check if pipecat is installed in Dockerfile
|
||||
if ! grep -q 'pipecat\.git@' "$DOCKERFILE"; then
|
||||
echo -e "${RED}❌ ERROR: No pipecat installation found in api/Dockerfile${NC}"
|
||||
echo "Expected to find a line like: RUN pip install 'git+https://github.com/dograh-hq/pipecat.git@<commit>'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Get the commit from the Dockerfile (extract whatever length is there)
|
||||
DOCKERFILE_COMMIT=$(grep -oE 'pipecat\.git@[a-f0-9]+' "$DOCKERFILE" | cut -d'@' -f2)
|
||||
# Normalize to 7 chars for comparison
|
||||
DOCKERFILE_SHORT=$(echo "$DOCKERFILE_COMMIT" | cut -c1-7)
|
||||
|
||||
echo "🐳 Dockerfile commit: $DOCKERFILE_SHORT"
|
||||
|
||||
# Compare the short commits (7 chars)
|
||||
if [ "$SUBMODULE_SHORT" != "$DOCKERFILE_SHORT" ]; then
|
||||
echo ""
|
||||
echo -e "${RED}❌ ERROR: Version mismatch detected!${NC}"
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
echo -e "${YELLOW}Submodule:${NC} $SUBMODULE_SHORT"
|
||||
echo -e "${YELLOW}Dockerfile:${NC} $DOCKERFILE_SHORT"
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
echo ""
|
||||
echo -e "${BLUE}👉 TO FIX: Update the pipecat commit in api/Dockerfile to match the submodule${NC}"
|
||||
echo ""
|
||||
echo "Update api/Dockerfile line with pipecat installation to use commit: $SUBMODULE_SHORT"
|
||||
echo "Then commit and push the updated api/Dockerfile"
|
||||
echo ""
|
||||
|
||||
# For GitHub Actions, output in annotation format for PR checks
|
||||
if [ "${GITHUB_ACTIONS:-false}" == "true" ]; then
|
||||
echo "::error file=api/Dockerfile,title=Pipecat Version Mismatch::Dockerfile has pipecat@$DOCKERFILE_SHORT but submodule is at $SUBMODULE_SHORT. Please update api/Dockerfile to use commit $SUBMODULE_SHORT"
|
||||
fi
|
||||
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Success!
|
||||
echo "⚠️ This script is deprecated!"
|
||||
echo ""
|
||||
echo -e "${GREEN}✅ SUCCESS: Pipecat versions are synchronized!${NC}"
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
echo -e "${GREEN}Both using commit: $SUBMODULE_SHORT${NC}"
|
||||
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
|
||||
|
||||
echo "Pipecat version synchronization is now automatic:"
|
||||
echo "• GitHub Actions: Automatically extracts and uses submodule commit"
|
||||
echo "• Local builds: Use scripts/docker-build-local.sh"
|
||||
echo ""
|
||||
echo "No manual Dockerfile updates are needed anymore! 🎉"
|
||||
exit 0
|
||||
34
scripts/docker-build-local.sh
Executable file
34
scripts/docker-build-local.sh
Executable file
|
|
@ -0,0 +1,34 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# docker-build-local.sh
|
||||
#
|
||||
# Helper script for building Docker images locally with correct pipecat commit.
|
||||
# This ensures local builds use the same pipecat version as the submodule.
|
||||
#
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Get the directory where this script is located
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||
|
||||
# Colors for output
|
||||
GREEN='\033[0;32m'
|
||||
BLUE='\033[0;34m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
echo "🔨 Building Docker images with pipecat submodule..."
|
||||
|
||||
# Get the pipecat commit SHA
|
||||
PIPECAT_COMMIT=$("$SCRIPT_DIR/get_pipecat_commit.sh")
|
||||
echo -e "${BLUE}📦 Using pipecat commit: ${PIPECAT_COMMIT}${NC}"
|
||||
|
||||
# Export for docker-compose
|
||||
export PIPECAT_COMMIT
|
||||
|
||||
# Run docker-compose build with the commit SHA
|
||||
cd "$PROJECT_ROOT"
|
||||
docker-compose build "$@"
|
||||
|
||||
echo -e "${GREEN}✅ Docker build completed successfully!${NC}"
|
||||
echo -e "${GREEN} Pipecat commit: ${PIPECAT_COMMIT}${NC}"
|
||||
24
scripts/get_pipecat_commit.sh
Executable file
24
scripts/get_pipecat_commit.sh
Executable file
|
|
@ -0,0 +1,24 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# get_pipecat_commit.sh
|
||||
#
|
||||
# Gets the current pipecat submodule commit SHA.
|
||||
# Used by Docker build process to ensure Dockerfile always uses the correct version.
|
||||
#
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Get the directory where this script is located
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||
|
||||
# Check if pipecat submodule exists
|
||||
if [ ! -d "$PROJECT_ROOT/pipecat/.git" ]; then
|
||||
echo "ERROR: pipecat submodule not initialized at $PROJECT_ROOT/pipecat" >&2
|
||||
echo "Run: git submodule update --init --recursive" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Get the commit SHA from the submodule
|
||||
cd "$PROJECT_ROOT/pipecat"
|
||||
git rev-parse HEAD
|
||||
Loading…
Add table
Add a link
Reference in a new issue