Move Dockerfiles to Component Directories #1846
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![fine-ai[bot]](https://avatars.githubusercontent.com/in/293841?s=60&v=4){kind=small}
- Created a new folder 'dockerfiles' in the root directory to organize all Dockerfiles. - Moved Dockerfile.ui, Dockerfile.uibackend, Dockerfile.orchestrator, Dockerfile.apiserver, Dockerfile.cli, Dockerfile for sdk-go example, Dockerfile for sdk-python example, and Dockerfile.test for sdk-python example to the 'dockerfiles' folder. - Updated the paths in the Bake file to reflect the new locations of the Dockerfiles.
|
Hey there and thank you for opening this pull request! 👋🏼 We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted. Details: |
|
/code fine instead of creating a dockerfiles directory, put each dockerfile in the correct directory according to his suffix |
|
On it! 🚀 I'm diving into the details and will start coding shortly. Expect a pull request from me soon! |
|
/fine fine instead of creating a dockerfiles directory, put each dockerfile in the correct directory according to his suffix |
galbash
suggested changes
Jun 25, 2024
| @@ -55,7 +55,13 @@ $(DIST_DIR): | |||
|
|
|||
| .PHONY: help | |||
| help: ## Display this help | |||
| @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-30s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) | |||
| @awk 'BEGIN {FS = ":.*##"; printf " | |||
| @@ -0,0 +1,52 @@ | |||
| # syntax=docker/dockerfile:1@sha256:e87caa74dcb7d46cd820352bfea12591f3dba3ddc4285e19c7dcd13359f7cefd | |||
There was a problem hiding this comment.
instead of creating a dockerfiles directory, put each dockerfile in the correct directory according to his suffix
do for all dockerfiles
| @@ -410,7 +416,7 @@ $(DIST_DIR)/aws-cloudformation-$(VERSION).tar.gz: $(DIST_DIR)/aws-cloudformation | |||
| $(DIST_DIR)/aws-cloudformation-$(VERSION).bundle: $(CFN_FILES) | $(CFN_DIST_DIR) | |||
| $(info --- Generate Cloudformation bundle) | |||
| cp -vR $(CFN_DIR)/* $(CFN_DIST_DIR)/ | |||
| sed -i -E 's@(ghcr\.io\/openclarity\/vmclarity\-(apiserver|cli|orchestrator|ui-backend|ui)):latest@\1:$(VERSION)@' $(CFN_DIST_DIR)/VmClarity.cfn | |||
| sed -i -E 's@(ghcr\.io\/openclarity\/vmclarity\-(apiserver|cli|orchestrator|ui-backend|ui)):latest@:$(VERSION)@' $(CFN_DIST_DIR)/VmClarity.cfn | |||
| @@ -433,7 +439,7 @@ $(DIST_DIR)/azure-bicep-$(VERSION).tar.gz: $(DIST_DIR)/azure-bicep-$(VERSION).bu | |||
| $(DIST_DIR)/azure-bicep-$(VERSION).bundle: $(BICEP_FILES) bin/bicep | $(BICEP_DIST_DIR) | |||
| $(info --- Generate Bicep bundle) | |||
| cp -vR $(BICEP_DIR)/* $(BICEP_DIST_DIR)/ | |||
| sed -i -E 's@(ghcr\.io\/openclarity\/vmclarity\-(apiserver|cli|orchestrator|ui-backend|ui)):latest@\1:$(VERSION)@' \ | |||
| sed -i -E 's@(ghcr\.io\/openclarity\/vmclarity\-(apiserver|cli|orchestrator|ui-backend|ui)):latest@:$(VERSION)@' \ | |||
| @@ -457,7 +463,7 @@ $(DIST_DIR)/docker-compose-$(VERSION).tar.gz: $(DIST_DIR)/docker-compose-$(VERSI | |||
| $(DIST_DIR)/docker-compose-$(VERSION).bundle: $(DOCKER_COMPOSE_FILES) | $(DOCKER_COMPOSE_DIST_DIR) | |||
| $(info --- Generate Docker Compose bundle) | |||
| cp -vR $(DOCKER_COMPOSE_DIR)/* $(DOCKER_COMPOSE_DIST_DIR)/ | |||
| sed -i -E 's@(ghcr\.io\/openclarity\/vmclarity\-(apiserver|cli|orchestrator|ui-backend|ui)):latest@\1:$(VERSION)@' \ | |||
| sed -i -E 's@(ghcr\.io\/openclarity\/vmclarity\-(apiserver|cli|orchestrator|ui-backend|ui)):latest@:$(VERSION)@' \ | |||
| @@ -481,7 +487,7 @@ $(DIST_DIR)/gcp-deployment-$(VERSION).tar.gz: $(DIST_DIR)/gcp-deployment-$(VERSI | |||
| $(DIST_DIR)/gcp-deployment-$(VERSION).bundle: $(GCP_DM_FILES) | $(GCP_DM_DIST_DIR) | |||
| $(info --- Generate Google Cloud Deployment bundle) | |||
| cp -vR $(GCP_DM_DIR)/* $(GCP_DM_DIST_DIR)/ | |||
| sed -i -E 's@(ghcr\.io\/openclarity\/vmclarity\-(apiserver|cli|orchestrator|ui-backend|ui)):latest@\1:$(VERSION)@' \ | |||
| sed -i -E 's@(ghcr\.io\/openclarity\/vmclarity\-(apiserver|cli|orchestrator|ui-backend|ui)):latest@:$(VERSION)@' \ | |||
|
OK! I've created a pull request for you. Take a look when you get the chance: |
|
Please reopen a new PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Organize Dockerfiles into a new 'dockerfiles' folder