Skip to content

refactor: modernize Makefile and align with current Docker workflow#775

Closed
Anuj192006 wants to merge 1 commit into
hyperledger-cello:mainfrom
Anuj192006:refactor/modernize-makefile
Closed

refactor: modernize Makefile and align with current Docker workflow#775
Anuj192006 wants to merge 1 commit into
hyperledger-cello:mainfrom
Anuj192006:refactor/modernize-makefile

Conversation

@Anuj192006

Copy link
Copy Markdown

This PR rewrites the main Makefile to address issue #767, bringing it in line with the project's current repository structure and modern Docker Compose (v2) practices.

Key Changes:

  • Path Corrections: Updated build targets to point to the correct src/ subdirectories, replacing dead references to the build_image/ folder.
  • Deployment Consistency: Unified start, stop, and clean targets to use a consistent Compose file selection based on a MODE toggle (dev/prod).
  • Environment Support: Added logic to handle arm64 (Mac M1/M2) compatibility by mapping to amd64 for builds.
  • Versioning: Implemented standard Hyperledger snapshot tagging (IMG_TAG) for local builds.
  • Maintenance: Removed ~150 lines of redundant variables and brittle "setup" abstractions in favor of direct Docker commands.

Validation:

  • Verified make help output for correct target categorization.
  • Checked all Dockerfile paths against the actual filesystem.
  • Ensured consistency across root docker-compose.dev.yaml and Makefile.

Fixes #767

@yeasy yeasy requested a review from dodo920306 May 8, 2026 04:08
- Fix broken Dockerfile paths in Makefile
- Modernize Docker Compose commands (v2)
- Unified dev/prod deployment flow
- Added ARCH detection for Mac compatibility
- Removed obsolete environment variables

Fixes hyperledger-cello#767

Signed-off-by: Anuj192006 <anuju712@gmail.com>
@ryjones ryjones force-pushed the refactor/modernize-makefile branch from f158698 to e035ba1 Compare June 17, 2026 22:00
@Anuj192006

Copy link
Copy Markdown
Author

Thanks for the update. I’ll review the latest changes made to the branch. I also noticed the workflows are awaiting maintainer approval, so I’ll wait for them to run. Please let me know if anything else is needed from my side.

@yeasy yeasy requested a review from YoungHypo June 30, 2026 11:46
@yeasy

yeasy commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

Need to rebase first.

@yeasy yeasy closed this Jun 30, 2026
@Anuj192006

Copy link
Copy Markdown
Author

I rebased the branch onto the latest main, resolved the Makefile conflict, and pushed the updated branch. Could you please reopen the PR for review? Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Todo: Rewrite Makefile

2 participants