- Voorlopige (werkende) setup tem verification service, bunny integratie, ...
This commit is contained in:
Josako
@@ -14,17 +14,13 @@ x-common-variables: &common-variables
|
||||
FLOWER_USER: 'Felucia'
|
||||
FLOWER_PASSWORD: 'Jungles'
|
||||
OPENAI_API_KEY: 'sk-proj-8R0jWzwjL7PeoPyMhJTZT3BlbkFJLb6HfRB2Hr9cEVFWEhU7'
|
||||
GROQ_API_KEY: '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'
|
||||
MISTRAL_API_KEY: '0f4ZiQ1kIpgIKTHX8d0a8GOD2vAgVqEn'
|
||||
ANTHROPIC_API_KEY: 'sk-ant-api03-c2TmkzbReeGhXBO5JxNH6BJNylRDonc9GmZd0eRbrvyekec2'
|
||||
JWT_SECRET_KEY: 'bsdMkmQ8ObfMD52yAFg4trrvjgjMhuIqg2fjDpD/JqvgY0ccCcmlsEnVFmR79WPiLKEA3i8a5zmejwLZKl4v9Q=='
|
||||
API_ENCRYPTION_KEY: 'xfF5369IsredSrlrYZqkM9ZNrfUASYYS6TCcAR9UKj4='
|
||||
MINIO_ENDPOINT: minio:9000
|
||||
MINIO_ACCESS_KEY: minioadmin
|
||||
MINIO_SECRET_KEY: minioadmin
|
||||
NGINX_SERVER_NAME: 'localhost http://macstudio.ask-eve-ai-local.com/'
|
||||
LANGCHAIN_API_KEY: "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"
|
||||
SERPER_API_KEY: "e4c553856d0e6b5a171ec5e6b69d874285b9badf"
|
||||
CREWAI_STORAGE_DIR: "/app/crewai_storage"
|
||||
PUSH_GATEWAY_HOST: "pushgateway"
|
||||
PUSH_GATEWAY_PORT: "9091"
|
||||
|
||||
@@ -29,8 +29,6 @@ x-common-variables: &common-variables
|
||||
FLOWER_USER: 'Felucia'
|
||||
FLOWER_PASSWORD: 'Jungles'
|
||||
OPENAI_API_KEY: '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'
|
||||
GROQ_API_KEY: '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'
|
||||
ANTHROPIC_API_KEY: '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'
|
||||
MISTRAL_API_KEY: 'PjnUeDRPD7B144wdHlH0CzR7m0z8RHXi'
|
||||
JWT_SECRET_KEY: '0d99e810e686ea567ef305d8e9b06195c4db482952e19276590a726cde60a408'
|
||||
API_ENCRYPTION_KEY: 'Ly5XYWwEKiasfAwEqdEMdwR-k0vhrq6QPYd4whEROB0='
|
||||
@@ -40,8 +38,6 @@ x-common-variables: &common-variables
|
||||
MINIO_ACCESS_KEY: 04JKmQln8PQpyTmMiCPc
|
||||
MINIO_SECRET_KEY: 2PEZAD1nlpAmOyDV0TUTuJTQw1qVuYLF3A7GMs0D
|
||||
NGINX_SERVER_NAME: 'evie.askeveai.com mxz536.stackhero-network.com'
|
||||
LANGCHAIN_API_KEY: "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"
|
||||
SERPER_API_KEY: "e4c553856d0e6b5a171ec5e6b69d874285b9badf"
|
||||
CREWAI_STORAGE_DIR: "/app/crewai_storage"
|
||||
|
||||
networks:
|
||||
|
||||
238
docker/tag_registry_version.sh
Executable file
238
docker/tag_registry_version.sh
Executable file
@@ -0,0 +1,238 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Exit on any error
|
||||
set -e
|
||||
|
||||
# Function to display usage information
|
||||
usage() {
|
||||
echo "Usage: $0 <version> [options]"
|
||||
echo " version : Version to tag (e.g., v1.2.3, v1.2.3-alpha, v2.0.0-beta)"
|
||||
echo ""
|
||||
echo "Options:"
|
||||
echo " --services <service1,service2,...> : Specific services to tag (default: all EveAI services)"
|
||||
echo " --dry-run : Show what would be done without executing"
|
||||
echo " --force : Overwrite existing version tags"
|
||||
echo ""
|
||||
echo "Examples:"
|
||||
echo " $0 v1.2.3-alpha"
|
||||
echo " $0 v2.0.0 --services eveai_api,eveai_workers"
|
||||
echo " $0 v1.0.0-beta --dry-run"
|
||||
}
|
||||
|
||||
# Check if version is provided
|
||||
if [ $# -eq 0 ]; then
|
||||
echo "❌ Error: Version is required"
|
||||
usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
VERSION=$1
|
||||
shift
|
||||
|
||||
# Default values
|
||||
SERVICES=""
|
||||
DRY_RUN=false
|
||||
FORCE=false
|
||||
|
||||
# Parse options
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case $1 in
|
||||
--services)
|
||||
SERVICES="$2"
|
||||
shift 2
|
||||
;;
|
||||
--dry-run)
|
||||
DRY_RUN=true
|
||||
shift
|
||||
;;
|
||||
--force)
|
||||
FORCE=true
|
||||
shift
|
||||
;;
|
||||
-*)
|
||||
echo "❌ Unknown option: $1"
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
*)
|
||||
echo "❌ Unexpected argument: $1"
|
||||
usage
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Validate version format (flexible semantic versioning)
|
||||
if [[ ! "$VERSION" =~ ^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9\-]+)?$ ]]; then
|
||||
echo "❌ Error: Invalid version format. Expected format: v1.2.3 or v1.2.3-alpha"
|
||||
echo " Examples: v1.0.0, v2.1.3-beta, v1.0.0-rc1"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Ensure version starts with 'v'
|
||||
if [[ ! "$VERSION" =~ ^v ]]; then
|
||||
VERSION="v$VERSION"
|
||||
fi
|
||||
|
||||
# Local registry configuration
|
||||
REGISTRY="registry.ask-eve-ai-local.com"
|
||||
ACCOUNT="josakola"
|
||||
|
||||
# Check if podman is available
|
||||
if ! command -v podman &> /dev/null; then
|
||||
echo "❌ Error: podman not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check if yq is available
|
||||
if ! command -v yq &> /dev/null; then
|
||||
echo "❌ Error: yq not found (required for parsing compose file)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check if compose file exists
|
||||
COMPOSE_FILE="compose_dev.yaml"
|
||||
if [[ ! -f "$COMPOSE_FILE" ]]; then
|
||||
echo "❌ Error: Compose file '$COMPOSE_FILE' not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "🏷️ EveAI Registry Version Tagging Script"
|
||||
echo "📦 Version: $VERSION"
|
||||
echo "🏪 Registry: $REGISTRY"
|
||||
echo "👤 Account: $ACCOUNT"
|
||||
|
||||
# Get services to process
|
||||
if [[ -n "$SERVICES" ]]; then
|
||||
# Convert comma-separated list to array
|
||||
IFS=',' read -ra SERVICE_ARRAY <<< "$SERVICES"
|
||||
else
|
||||
# Get all EveAI services (excluding nginx as per requirements)
|
||||
SERVICE_ARRAY=()
|
||||
while IFS= read -r line; do
|
||||
SERVICE_ARRAY+=("$line")
|
||||
done < <(yq e '.services | keys | .[]' "$COMPOSE_FILE" | grep -E '^eveai_')
|
||||
fi
|
||||
|
||||
echo "🔍 Services to process: ${SERVICE_ARRAY[*]}"
|
||||
|
||||
# Function to check if image exists in registry
|
||||
check_image_exists() {
|
||||
local image_name="$1"
|
||||
if podman image exists "$image_name" 2>/dev/null; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Function to check if version tag already exists
|
||||
check_version_exists() {
|
||||
local service="$1"
|
||||
local version_tag="$REGISTRY/$ACCOUNT/$service:$VERSION"
|
||||
|
||||
# Try to inspect the image in the registry
|
||||
if podman image exists "$version_tag" 2>/dev/null; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Process each service
|
||||
PROCESSED_SERVICES=()
|
||||
FAILED_SERVICES=()
|
||||
|
||||
for SERVICE in "${SERVICE_ARRAY[@]}"; do
|
||||
echo ""
|
||||
echo "🔄 Processing service: $SERVICE"
|
||||
|
||||
# Check if service exists in compose file
|
||||
if ! yq e ".services.$SERVICE" "$COMPOSE_FILE" | grep -q "image:"; then
|
||||
echo "⚠️ Warning: Service '$SERVICE' not found in $COMPOSE_FILE, skipping"
|
||||
continue
|
||||
fi
|
||||
|
||||
# Construct image names
|
||||
LATEST_IMAGE="$REGISTRY/$ACCOUNT/$SERVICE:latest"
|
||||
VERSION_IMAGE="$REGISTRY/$ACCOUNT/$SERVICE:$VERSION"
|
||||
|
||||
echo " 📥 Source: $LATEST_IMAGE"
|
||||
echo " 🏷️ Target: $VERSION_IMAGE"
|
||||
|
||||
# Check if version already exists
|
||||
if check_version_exists "$SERVICE" && [[ "$FORCE" != true ]]; then
|
||||
echo " ⚠️ Version $VERSION already exists for $SERVICE"
|
||||
echo " 💡 Use --force to overwrite existing tags"
|
||||
continue
|
||||
fi
|
||||
|
||||
if [[ "$DRY_RUN" == true ]]; then
|
||||
echo " 🔍 [DRY RUN] Would tag $LATEST_IMAGE as $VERSION_IMAGE"
|
||||
PROCESSED_SERVICES+=("$SERVICE")
|
||||
continue
|
||||
fi
|
||||
|
||||
# Check if latest image exists
|
||||
if ! check_image_exists "$LATEST_IMAGE"; then
|
||||
echo " ❌ Latest image not found: $LATEST_IMAGE"
|
||||
echo " 💡 Run build_and_push_eveai.sh first to create latest images"
|
||||
FAILED_SERVICES+=("$SERVICE")
|
||||
continue
|
||||
fi
|
||||
|
||||
# Pull latest image
|
||||
echo " 📥 Pulling latest image..."
|
||||
if ! podman pull "$LATEST_IMAGE"; then
|
||||
echo " ❌ Failed to pull $LATEST_IMAGE"
|
||||
FAILED_SERVICES+=("$SERVICE")
|
||||
continue
|
||||
fi
|
||||
|
||||
# Tag with version
|
||||
echo " 🏷️ Tagging with version $VERSION..."
|
||||
if ! podman tag "$LATEST_IMAGE" "$VERSION_IMAGE"; then
|
||||
echo " ❌ Failed to tag $LATEST_IMAGE as $VERSION_IMAGE"
|
||||
FAILED_SERVICES+=("$SERVICE")
|
||||
continue
|
||||
fi
|
||||
|
||||
# Push version tag to registry
|
||||
echo " 📤 Pushing version tag to registry..."
|
||||
if ! podman push "$VERSION_IMAGE"; then
|
||||
echo " ❌ Failed to push $VERSION_IMAGE"
|
||||
FAILED_SERVICES+=("$SERVICE")
|
||||
continue
|
||||
fi
|
||||
|
||||
echo " ✅ Successfully tagged $SERVICE with version $VERSION"
|
||||
PROCESSED_SERVICES+=("$SERVICE")
|
||||
done
|
||||
|
||||
# Summary
|
||||
echo ""
|
||||
echo "📊 Summary:"
|
||||
echo "✅ Successfully processed: ${#PROCESSED_SERVICES[@]} services"
|
||||
if [[ ${#PROCESSED_SERVICES[@]} -gt 0 ]]; then
|
||||
printf " - %s\n" "${PROCESSED_SERVICES[@]}"
|
||||
fi
|
||||
|
||||
if [[ ${#FAILED_SERVICES[@]} -gt 0 ]]; then
|
||||
echo "❌ Failed: ${#FAILED_SERVICES[@]} services"
|
||||
printf " - %s\n" "${FAILED_SERVICES[@]}"
|
||||
fi
|
||||
|
||||
if [[ "$DRY_RUN" == true ]]; then
|
||||
echo "🔍 This was a dry run - no actual changes were made"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
if [[ ${#FAILED_SERVICES[@]} -eq 0 ]]; then
|
||||
echo "🎉 All services successfully tagged with version $VERSION!"
|
||||
echo "📦 Images are available in registry: $REGISTRY/$ACCOUNT/[service]:$VERSION"
|
||||
else
|
||||
echo "⚠️ Some services failed to process. Check the errors above."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "🕐 Finished at $(date +"%d/%m/%Y %H:%M:%S")"
|
||||
Reference in New Issue
Block a user