Skip to content

chore: merge develop into master for production deployment readiness - #3

Merged
youdingtianzhaogeyinzuo merged 16 commits into
masterfrom
develop
Apr 10, 2026
Merged

youdingtianzhaogeyinzuo merged 16 commits into
masterfrom
develop

Conversation

@Cho-Geer

Copy link
Copy Markdown
Owner

📋 Summary

Merge deployment verification workflow optimizations, environment template fixes, and security enhancements from develop into master.

🔧 Key Changes

  • verify-images.yml now dynamically generates environment files and injects Secrets
  • Fixed image tag replacement: the dev environment now correctly uses the develop tag
  • Added fail-fast: false to prevent matrix strategy cancellation
  • Removed conditional Docker Hub login to allow private image pulls during PR verification
  • Example files now use the {{DOCKER_HUB_USER}} placeholder instead of hardcoded usernames
  • Enhanced the verification script to auto-generate missing environment files from .example templates

✅ Verification

  • The verify-images workflow on the develop branch fully passes for both dev and prod environments
  • Image pulls, service startups, and health checks all succeed

📦 Impact

  • After merging, the master branch will use the main tag for production environment verification (effective once the backend and frontend master branches have pushed the corresponding images).

🔗 Related

  • Depends on booking-backend and booking-frontend being merged to master first.

Cho-Geer and others added 16 commits April 9, 2026 01:42
- Create .github/workflows directory with verify-deployment.yml and verify-images.yml
- Update .gitignore to implement documentation management strategy
- Configure .gitignore to ignore most docs while preserving core documentation files
- Add specific exceptions for devops-ci-cd-assessment-and-remediation-plan.md and devops-runbook.md
- Move build-all-images.ps1 to scripts directory
- Add build-all-images.sh Bash version for Linux/Mac
- Update relative paths for script relocation
- Centralize all deployment scripts for consistency
- Add pull_request trigger to verify-images.yml
- Ensure branch protection requirements can be met for PRs
- Match trigger configuration with verify-deployment workflow
- Enable image verification checks on pull requests to master/develop

This fixes the issue where verify-images status check was required
but never ran on pull requests, blocking PR merges.
Enhance image verification script to auto-generate missing env files and inject secrets based on environment.
Added environment variables for image verification.
…king-deploy into feat/devops-cicd-foundation
Remove condition to log in to Docker Hub for all events.
@Cho-Geer
Cho-Geer requested a review from zhaogeyinzuo April 10, 2026 14:55
@Cho-Geer Cho-Geer self-assigned this Apr 10, 2026
@Cho-Geer Cho-Geer added the CI/CD label Apr 10, 2026

@youdingtianzhaogeyinzuo youdingtianzhaogeyinzuo left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

@youdingtianzhaogeyinzuo
youdingtianzhaogeyinzuo merged commit f946ff6 into master Apr 10, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants