diff --git a/clickzetta/MAINTAINER_RESPONSE.md b/clickzetta/MAINTAINER_RESPONSE.md index 2428ac9305..61604097a4 100644 --- a/clickzetta/MAINTAINER_RESPONSE.md +++ b/clickzetta/MAINTAINER_RESPONSE.md @@ -56,10 +56,10 @@ The implementation is ready for production use with comprehensive testing showin While the PR is under review, users can test the ClickZetta integration using multi-architecture Docker images: **Available Images:** -- `czqiliang/dify-clickzetta-api:latest` (linux/amd64, linux/arm64) -- `czqiliang/dify-clickzetta-web:latest` (linux/amd64, linux/arm64) -- `czqiliang/dify-clickzetta-api:clickzetta-integration` (tagged version) -- `czqiliang/dify-clickzetta-web:clickzetta-integration` (tagged version) +- `czqiliang/dify-clickzetta-api:v1.6.0` (linux/amd64, linux/arm64) - Stable release +- `czqiliang/dify-clickzetta-api:latest` (linux/amd64, linux/arm64) - Latest build +- `czqiliang/dify-clickzetta-api:clickzetta-integration` (linux/amd64, linux/arm64) - Development +- Web service uses official `langgenius/dify-web:1.6.0` (no ClickZetta changes needed) **Quick Start Guide:** ```bash diff --git a/clickzetta/README.clickzetta.md b/clickzetta/README.clickzetta.md index f85e4da45c..c79232a515 100644 --- a/clickzetta/README.clickzetta.md +++ b/clickzetta/README.clickzetta.md @@ -151,6 +151,11 @@ This is a preview version. If you encounter issues: ## 🔄 Updates +**Available Image Tags:** +- `v1.6.0` - Stable release (recommended) +- `latest` - Latest build +- `clickzetta-integration` - Development version + To update to the latest version: ```bash # Pull latest images @@ -160,6 +165,17 @@ docker-compose -f docker-compose.clickzetta.yml pull docker-compose -f docker-compose.clickzetta.yml up -d ``` +To use a specific version, edit `docker-compose.clickzetta.yml`: +```yaml +services: + api: + image: czqiliang/dify-clickzetta-api:v1.6.0 # or latest + worker: + image: czqiliang/dify-clickzetta-api:v1.6.0 # or latest + web: + image: langgenius/dify-web:1.6.0 # official Dify web image +``` + ## ⚠️ Production Use This is a preview build for testing purposes. For production deployment: diff --git a/clickzetta/build-and-push-multiarch.sh b/clickzetta/build-and-push-multiarch.sh index 6760c25397..8a87f94813 100755 --- a/clickzetta/build-and-push-multiarch.sh +++ b/clickzetta/build-and-push-multiarch.sh @@ -9,6 +9,7 @@ set -e DOCKER_HUB_USERNAME="czqiliang" IMAGE_NAME="dify-clickzetta" TAG="latest" +VERSION_TAG="v1.6.0" PLATFORMS="linux/amd64,linux/arm64" # Colors for output @@ -65,6 +66,7 @@ docker buildx build \ --platform $PLATFORMS \ --file api.Dockerfile \ --tag ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-api:${TAG} \ + --tag ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-api:${VERSION_TAG} \ --tag ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-api:clickzetta-integration \ --push \ .. @@ -72,17 +74,9 @@ docker buildx build \ echo -e "${GREEN}✓ API image built and pushed successfully${NC}" echo -# Build and push Web image -echo -e "${BLUE}Step 4: Building and pushing Web image${NC}" -docker buildx build \ - --platform $PLATFORMS \ - --file web.Dockerfile \ - --tag ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-web:${TAG} \ - --tag ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-web:clickzetta-integration \ - --push \ - .. - -echo -e "${GREEN}✓ Web image built and pushed successfully${NC}" +# Web service uses official Dify image (no ClickZetta-specific changes needed) +echo -e "${BLUE}Step 4: Web service uses official langgenius/dify-web image${NC}" +echo -e "${GREEN}✓ Web service configuration completed${NC}" echo # User files are already created in clickzetta/ directory @@ -100,11 +94,13 @@ echo # Display final information echo -e "${GREEN}=== Build Complete! ===${NC}" -echo -e "${YELLOW}Images pushed to Docker Hub:${NC}" +echo -e "${YELLOW}ClickZetta API images pushed to Docker Hub:${NC}" echo -e " • ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-api:${TAG}" +echo -e " • ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-api:${VERSION_TAG}" echo -e " • ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-api:clickzetta-integration" -echo -e " • ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-web:${TAG}" -echo -e " • ${DOCKER_HUB_USERNAME}/${IMAGE_NAME}-web:clickzetta-integration" +echo +echo -e "${YELLOW}Web service uses official Dify image:${NC}" +echo -e " • langgenius/dify-web:1.6.0 (no ClickZetta changes needed)" echo echo -e "${YELLOW}User files created:${NC}" echo -e " • docker-compose.clickzetta.yml - Ready-to-use compose file" diff --git a/clickzetta/docker-compose.clickzetta.yml b/clickzetta/docker-compose.clickzetta.yml index be3a504b80..2f97799d5f 100644 --- a/clickzetta/docker-compose.clickzetta.yml +++ b/clickzetta/docker-compose.clickzetta.yml @@ -3,7 +3,7 @@ version: '3.8' services: # API service with ClickZetta integration api: - image: czqiliang/dify-clickzetta-api:latest + image: czqiliang/dify-clickzetta-api:v1.6.0 restart: always environment: # Core settings @@ -61,7 +61,7 @@ services: # Worker service worker: - image: czqiliang/dify-clickzetta-api:latest + image: czqiliang/dify-clickzetta-api:v1.6.0 restart: always environment: - MODE=worker @@ -110,7 +110,7 @@ services: # Web service web: - image: czqiliang/dify-clickzetta-web:latest + image: langgenius/dify-web:1.6.0 restart: always environment: - CONSOLE_API_URL=${CONSOLE_API_URL:-}