docs+docker: Enhanced Docker configuration and workflow fixes (#4)
* addinte templates and user guide * up docs * up * up claude.md * add mb * umb * up workflow * up settings claude * adding detailed docs * adding missing files docs * add main readme for docs * up main readme * adding docs for tests * Complete documentation integration with test structure analysis link Adds link to comprehensive test structure documentation in main README.md, finalizing the progressive disclosure strategy for project documentation. This completes the documentation integration work that includes: - Architecture documentation - API reference documentation - Contributing guidelines - Detailed test analysis 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * removing folders from git * up * up * up gitignore * feat: Add automatic semantic versioning workflow - Create GitHub Actions workflow for automatic version bumping based on PR title prefixes - Add version bumping script (scripts/bump_version.py) for programmatic updates - Update PR template with semantic versioning guidelines - Document versioning workflow in contributing guide - Integrate with existing Docker build workflow via git tags This enables automatic version management: - feat: triggers MINOR version bump - fix: triggers PATCH version bump - breaking: triggers MAJOR version bump - docs/chore/test: no version bump 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com> * fix: Separate Docker workflows for testing and publishing - Add docker-test.yml for PR validation (build test only) - Fix build_and_publish_docker.yml to trigger only on tags - Remove problematic sha prefix causing invalid tag format - Ensure proper workflow sequence: PR test → merge → version → publish 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * style: Fix black formatting issues in bump_version.py - Fix spacing and indentation to pass black formatter - Ensure code quality standards are met for CI workflow 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * style: Modernize type hints in bump_version.py - Replace typing.Tuple with modern tuple syntax - Remove deprecated typing imports per ruff suggestions - Maintain Python 3.10+ compatibility 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: Remove invalid colon in bash else statement - Fix bash syntax error in auto-version workflow - Remove Python-style colon from else statement - Resolves exit code 127 in version bump determination 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * feat: Add Docker build combinations for non-versioning prefixes - Add support for prefix+docker combinations (docs+docker:, chore+docker:, etc.) - Enable Docker build for non-versioning changes when requested - Add repository_dispatch trigger for Docker workflow - Update Docker tagging for PR-based builds (pr-X, main-sha) - Update PR template with new prefix options This allows contributors to force Docker builds for documentation, maintenance, and other non-versioning changes when needed. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * docs: Add comprehensive PR prefix and automation documentation - Update CONTRIBUTING.md with detailed PR prefix system explanation - Add automation workflow documentation to docs/contributing/workflows.md - Create new user-friendly contributing guide at docs/user-guides/contributing-guide.md - Include Mermaid diagrams for workflow visualization - Document Docker testing combinations and image tagging strategy - Add best practices and common mistakes to avoid This provides clear guidance for contributors on using the automated versioning and Docker build system effectively. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * docs+docker: Complete documentation infrastructure with Docker automation testing (#2) * fix: Remove invalid colon in bash else statement - Fix bash syntax error in auto-version workflow - Remove Python-style colon from else statement - Resolves exit code 127 in version bump determination 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * feat: Add Docker build combinations for non-versioning prefixes - Add support for prefix+docker combinations (docs+docker:, chore+docker:, etc.) - Enable Docker build for non-versioning changes when requested - Add repository_dispatch trigger for Docker workflow - Update Docker tagging for PR-based builds (pr-X, main-sha) - Update PR template with new prefix options This allows contributors to force Docker builds for documentation, maintenance, and other non-versioning changes when needed. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * docs: Add comprehensive PR prefix and automation documentation - Update CONTRIBUTING.md with detailed PR prefix system explanation - Add automation workflow documentation to docs/contributing/workflows.md - Create new user-friendly contributing guide at docs/user-guides/contributing-guide.md - Include Mermaid diagrams for workflow visualization - Document Docker testing combinations and image tagging strategy - Add best practices and common mistakes to avoid This provides clear guidance for contributors on using the automated versioning and Docker build system effectively. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Patryk Ciechanski <patryk.ciechanski@inetum.com> Co-authored-by: Claude <noreply@anthropic.com> * fix: Correct digest reference in Docker artifact attestation - Add id to build step to capture outputs - Fix subject-digest reference from steps.build.outputs.digest - Resolves 'One of subject-path or subject-digest must be provided' error 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * docs: Add comprehensive Docker image usage instructions - Add Option B (Published Docker Image) to main README.md - Update installation guide with published image as fastest option - Add comprehensive configuration examples for GHCR images - Document image tagging strategy (latest, versioned, PR builds) - Include version pinning examples for stability - Highlight benefits: instant setup, no build, cross-platform Users can now choose between: 1. Published image (fastest, no setup) - ghcr.io/patrykiti/gemini-mcp-server:latest 2. Local build (development, customization) - traditional setup 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * feat: Add automated Docker image usage instructions and PR comments - Generate comprehensive usage instructions in workflow summary after Docker build - Include exact docker pull commands with built image tags - Auto-generate Claude Desktop configuration examples - Add automatic PR comments with testing instructions for +docker builds - Show expected image tags (pr-X, main-sha) in PR comments - Include ready-to-use configuration snippets for immediate testing - Link to GitHub Container Registry and Actions for monitoring Now when Docker images are built, users get: - Step-by-step usage instructions in workflow summary - PR comments with exact pull commands and config - Copy-paste ready Claude Desktop configurations - Direct links to monitor build progress 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * feat: Add automatic README.md updating after Docker builds - Updates Docker image references in README.md and documentation files - Automatically commits and pushes changes after image builds - Handles both release builds (version tags) and development builds (PR numbers) - Ensures documentation always references the latest published images - Uses sed pattern matching to update ghcr.io image references 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * correcting * up * fix: GitHub Actions workflows semantic errors Fixed critical semantic and logic errors in auto-version and Docker workflows: Auto-version.yml fixes: - Removed duplicate echo statements for should_build_docker output - Fixed malformed if/else structure (else after else) - Removed redundant conditional blocks for docker: prefixes - Cleaned up duplicate lines in summary generation Build_and_publish_docker.yml fixes: - Replaced hardcoded 'patrykiti' with dynamic ${{ github.repository_owner }} - Enhanced regex pattern to support underscores in Docker tags: [a-zA-Z0-9\._-]* - Fixed sed patterns for dynamic repository owner detection These changes ensure workflows execute correctly and support any repository owner. 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com> * docs: Add advanced Docker configuration options to README Added comprehensive configuration section with optional environment variables: Docker Configuration Features: - Advanced configuration example with all available env vars - Complete table of environment variables with descriptions - Practical examples for common configuration scenarios - Clear documentation of config.py options for Docker users Available Configuration Options: - DEFAULT_MODEL: Choose between Pro (quality) vs Flash (speed) - DEFAULT_THINKING_MODE_THINKDEEP: Control token costs with thinking depth - LOG_LEVEL: Debug logging for troubleshooting - MCP_PROJECT_ROOT: Security sandbox for file access - REDIS_URL: Custom Redis configuration Benefits: - Users can customize server behavior without rebuilding images - Better cost control through model and thinking mode selection - Enhanced security through project root restrictions - Improved debugging capabilities with configurable logging - Complete transparency of available configuration options This addresses user request for exposing config.py parameters via Docker environment variables. 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Patryk Ciechanski <patryk.ciechanski@inetum.com> Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
PCITI
44
scripts/README.md
Normal file
44
scripts/README.md
Normal file
@@ -0,0 +1,44 @@
|
||||
# Scripts Directory
|
||||
|
||||
This directory contains utility scripts for the Gemini MCP Server project.
|
||||
|
||||
## bump_version.py
|
||||
|
||||
A utility script for semantic version bumping that integrates with the automatic versioning workflow.
|
||||
|
||||
### Usage
|
||||
|
||||
```bash
|
||||
python scripts/bump_version.py <major|minor|patch>
|
||||
```
|
||||
|
||||
### Examples
|
||||
|
||||
```bash
|
||||
# Bump patch version (e.g., 3.2.0 → 3.2.1)
|
||||
python scripts/bump_version.py patch
|
||||
|
||||
# Bump minor version (e.g., 3.2.0 → 3.3.0)
|
||||
python scripts/bump_version.py minor
|
||||
|
||||
# Bump major version (e.g., 3.2.0 → 4.0.0)
|
||||
python scripts/bump_version.py major
|
||||
```
|
||||
|
||||
### Features
|
||||
|
||||
- Reads current version from `config.py`
|
||||
- Applies semantic versioning rules
|
||||
- Updates both `__version__` and `__updated__` fields
|
||||
- Preserves file formatting and structure
|
||||
- Outputs new version for GitHub Actions integration
|
||||
|
||||
### Integration
|
||||
|
||||
This script is primarily used by the GitHub Actions workflow (`.github/workflows/auto-version.yml`) for automatic version bumping based on PR title prefixes. Manual usage is available for special cases.
|
||||
|
||||
### Version Bump Rules
|
||||
|
||||
- **Major**: Increments first digit, resets others (3.2.1 → 4.0.0)
|
||||
- **Minor**: Increments second digit, resets patch (3.2.1 → 3.3.0)
|
||||
- **Patch**: Increments third digit (3.2.1 → 3.2.2)
|
||||
115
scripts/bump_version.py
Executable file
115
scripts/bump_version.py
Executable file
@@ -0,0 +1,115 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Version bumping utility for Gemini MCP Server
|
||||
|
||||
This script handles semantic version bumping for the project by:
|
||||
- Reading current version from config.py
|
||||
- Applying the appropriate version bump (major, minor, patch)
|
||||
- Updating config.py with new version and timestamp
|
||||
- Preserving file structure and formatting
|
||||
"""
|
||||
|
||||
import re
|
||||
import sys
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def parse_version(version_string: str) -> tuple[int, int, int]:
|
||||
"""Parse semantic version string into tuple of integers."""
|
||||
match = re.match(r"^(\d+)\.(\d+)\.(\d+)", version_string)
|
||||
if not match:
|
||||
raise ValueError(f"Invalid version format: {version_string}")
|
||||
return int(match.group(1)), int(match.group(2)), int(match.group(3))
|
||||
|
||||
|
||||
def bump_version(version: tuple[int, int, int], bump_type: str) -> tuple[int, int, int]:
|
||||
"""Apply version bump according to semantic versioning rules."""
|
||||
major, minor, patch = version
|
||||
|
||||
if bump_type == "major":
|
||||
return (major + 1, 0, 0)
|
||||
elif bump_type == "minor":
|
||||
return (major, minor + 1, 0)
|
||||
elif bump_type == "patch":
|
||||
return (major, minor, patch + 1)
|
||||
else:
|
||||
raise ValueError(f"Invalid bump type: {bump_type}")
|
||||
|
||||
|
||||
def update_config_file(new_version: str) -> None:
|
||||
"""Update version and timestamp in config.py while preserving structure."""
|
||||
config_path = Path(__file__).parent.parent / "config.py"
|
||||
|
||||
if not config_path.exists():
|
||||
raise FileNotFoundError(f"config.py not found at {config_path}")
|
||||
|
||||
# Read the current content
|
||||
content = config_path.read_text()
|
||||
|
||||
# Update version using regex to preserve formatting
|
||||
version_pattern = r'(__version__\s*=\s*["\'])[\d\.]+(["\'])'
|
||||
content = re.sub(version_pattern, rf"\g<1>{new_version}\g<2>", content)
|
||||
|
||||
# Update the __updated__ field with current date
|
||||
current_date = datetime.now().strftime("%Y-%m-%d")
|
||||
updated_pattern = r'(__updated__\s*=\s*["\'])[\d\-]+(["\'])'
|
||||
content = re.sub(updated_pattern, rf"\g<1>{current_date}\g<2>", content)
|
||||
|
||||
# Write back the updated content
|
||||
config_path.write_text(content)
|
||||
print(f"Updated config.py: version={new_version}, updated={current_date}")
|
||||
|
||||
|
||||
def get_current_version() -> str:
|
||||
"""Extract current version from config.py."""
|
||||
config_path = Path(__file__).parent.parent / "config.py"
|
||||
|
||||
if not config_path.exists():
|
||||
raise FileNotFoundError(f"config.py not found at {config_path}")
|
||||
|
||||
content = config_path.read_text()
|
||||
match = re.search(r'__version__\s*=\s*["\']([^"\']+)["\']', content)
|
||||
|
||||
if not match:
|
||||
raise ValueError("Could not find __version__ in config.py")
|
||||
|
||||
return match.group(1)
|
||||
|
||||
|
||||
def main():
|
||||
"""Main entry point for version bumping."""
|
||||
if len(sys.argv) != 2:
|
||||
print("Usage: python bump_version.py <major|minor|patch>")
|
||||
sys.exit(1)
|
||||
|
||||
bump_type = sys.argv[1].lower()
|
||||
if bump_type not in ["major", "minor", "patch"]:
|
||||
print(f"Invalid bump type: {bump_type}")
|
||||
print("Valid types: major, minor, patch")
|
||||
sys.exit(1)
|
||||
|
||||
try:
|
||||
# Get current version
|
||||
current = get_current_version()
|
||||
print(f"Current version: {current}")
|
||||
|
||||
# Parse and bump version
|
||||
version_tuple = parse_version(current)
|
||||
new_version_tuple = bump_version(version_tuple, bump_type)
|
||||
new_version = f"{new_version_tuple[0]}.{new_version_tuple[1]}.{new_version_tuple[2]}"
|
||||
|
||||
# Update config file
|
||||
update_config_file(new_version)
|
||||
|
||||
# Output new version for GitHub Actions
|
||||
print(f"New version: {new_version}")
|
||||
print(f"::set-output name=version::{new_version}")
|
||||
|
||||
except Exception as e:
|
||||
print(f"Error: {e}")
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user