Skip to content

Conversation

@Survey845
Copy link
Contributor

Closes #474

Updated the Makefile by modifying the code to filter docker images, pruning dangling images, separating 'check' commands, and rearranging a few commands to follow alphabetical order.

Signed-off-by: Jaimukund Bhan [email protected]

Modified the following targets:
- all : Now runs 'make docker' to begin Cello docker image setup
- clean : Updated the filter for clearing out docker containers
- check : Removed lines which would not run after failing the format check (check is solely for format check now)
- deep-clean : Deleted helpers which do not exit and now it clears out docker images + local storage
- docker : Added the functionality to remove dangling images after setting up Cello images
- docker-clean : Changed the order of targets run, 'stop' is included in 'clean'
- stop : Added '@' to avoid printing 'if' statement on terminal
- clean-images : Updated the filter to clear out all Cello docker images, and prune dangling images
Close hyperledger-cello#474"

Signed-off-by: jaimukund bhan <[email protected]>
…ashboard

- clean-images : Modified the filter to only remove the images which are under the 'hyperledger' repository name and have the word 'cello' inside. This avoids deleting other Hyperledger images a user may have
- check-dashboard : Moved this helper command to the list of commands which shows up with 'make help'. Could not work well with the 'check' command before, which is now meant to check the code format only
- help : Rearranged the position of this command to maintain alphabetical order
- .PHONY : Added 'check-dashboard' to the list

Close hyperledger-cello#474

Signed-off-by: jaimukund bhan <[email protected]>
- Added a comment for check-dashboard on top of the file
- Repositioned the comment for 'help' to follow alphabetical order

Close hyperledger-cello#474

Signed-off-by: jaimukund bhan <[email protected]>
- Removed extra space at the head (Removed check-dashboard altogether).
- Reverted changes to "all" command (Runs "check" again)
- Reverted changes to "check" (Previosuly thought exiting due to error during code format check would disable the lines of the commands following it)
- Removed command to prune dangling images after "docker" (These images may be intermediaries).

Close hyperledger-cello#474

Signed-off-by: jaimukund bhan <[email protected]>
Spacing the head and "all" command correctly

Closes hyperledger-cello#474

Signed-off-by: jaimukund bhan <[email protected]>
Removed an extra line between 2 commands

Closes hyperledger-cello#474

Signed-off-by: jaimukund bhan <[email protected]>
@Survey845 Survey845 requested a review from yeasy April 29, 2025 05:25
@yeasy yeasy requested review from YoungHypo and xichen1 April 30, 2025 21:12
Copy link
Contributor

@yeasy yeasy left a comment

Choose a reason for hiding this comment

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

You need to resolve the conversation after fixing the issue.

Resolved typos and unnecessary changes

Closes hyperledger-cello#474

Signed-off-by: jaimukund bhan <[email protected]>
@Survey845
Copy link
Contributor Author

Another query regarding the MODE for start and stop I had was that even though I used the command "MODE=prod make start", it would still run the dev docker compose file. Is there some way the definition of MODE effect the definition of CONFIG_PROD_MODE that I may have missed? In case it needs changing, I can apply the "if" statement using MODE itself, instead of CONFIG_PROD_MODE

Survey845 and others added 2 commits May 2, 2025 22:17
Reverting changes made to the "check" command

Closes hyperledger-cello#474

Signed-off-by: jaimukund bhan <[email protected]>
Removed the stray tab on line 147

Close hyperledger-cello#474

Signed-off-by: jaimukund bhan <[email protected]>
@yeasy yeasy merged commit 1d86c12 into hyperledger-cello:main May 7, 2025
3 checks passed
@Survey845 Survey845 deleted the issue-474 branch May 8, 2025 17:19
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.

Clean Makefile

2 participants