feat: Use docker or podman to build and run #88
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,6 +60,16 @@ LDFLAGS += -X github.com/konveyor/${BINNAME}/cmd/version.gitCommit=${GIT_COMMIT} | |
| LDFLAGS += -X github.com/konveyor/${BINNAME}/cmd/version.gitTreeState=${GIT_DIRTY} | ||
| LDFLAGS += -extldflags "-static" | ||
|
|
||
| # Setting container tool | ||
| DOCKER_CMD := $(shell command -v docker 2> /dev/null) | ||
| PODMAN_CMD := $(shell command -v podman 2> /dev/null) | ||
|
|
||
| ifdef DOCKER_CMD | ||
| CONTAINER_TOOL = 'docker' | ||
| else ifdef PODMAN_CMD | ||
| CONTAINER_TOOL = 'podman' | ||
| endif | ||
|
|
||
| # HELP | ||
| # This will output the help for each task | ||
| .PHONY: help | ||
|
|
@@ -190,21 +200,43 @@ info: ## Get version info | |
| @echo "Git Commit: ${GIT_COMMIT}" | ||
| @echo "Git Tree State: ${GIT_DIRTY}" | ||
|
|
||
| # -- Container Image -- | ||
|
|
||
| .PHONY: cbuild | ||
| cbuild: ## Build container image | ||
| ifndef CONTAINER_TOOL | ||
| $(error No container tool (docker, podman) found in your environment. Please, install one) | ||
| endif | ||
|
|
||
| @echo "Building image with $(CONTAINER_TOOL)" | ||
|
|
||
| ${CONTAINER_TOOL} build -t ${REGISTRYNS}/${BINNAME}-builder:${VERSION} --cache-from ${REGISTRYNS}/${BINNAME}-builder:latest --target build_base --build-arg VERSION=${VERSION} --build-arg GO_VERSION=${GO_VERSION} . | ||
| ${CONTAINER_TOOL} build -t ${REGISTRYNS}/${BINNAME}:${VERSION} --cache-from ${REGISTRYNS}/${BINNAME}-builder:latest --cache-from ${REGISTRYNS}/${BINNAME}:latest --build-arg VERSION=${VERSION} --build-arg GO_VERSION=${GO_VERSION} . | ||
| ${CONTAINER_TOOL} tag ${REGISTRYNS}/${BINNAME}-builder:${VERSION} ${REGISTRYNS}/${BINNAME}-builder:latest | ||
| ${CONTAINER_TOOL} tag ${REGISTRYNS}/${BINNAME}:${VERSION} ${REGISTRYNS}/${BINNAME}:latest | ||
|
|
||
| .PHONY: cpush | ||
| cpush: ## Push container image | ||
| ifndef CONTAINER_TOOL | ||
| $(error No container tool (docker, podman) found in your environment. Please, install one) | ||
|
There was a problem hiding this comment. This line needs a tab space at start |
||
| endif | ||
|
|
||
| @echo "Pushing image with $(CONTAINER_TOOL)" | ||
|
|
||
| # To help with reusing layers and hence speeding up build | ||
| ${CONTAINER_TOOL} push ${REGISTRYNS}/${BINNAME}-builder:${VERSION} | ||
| ${CONTAINER_TOOL} push ${REGISTRYNS}/${BINNAME}:${VERSION} | ||
|
|
||
| .PHONY: crun | ||
| crun: ## Run container image | ||
| ifndef CONTAINER_TOOL | ||
| $(error No container tool (docker, podman) found in your environment. Please, install one) | ||
|
There was a problem hiding this comment. This line needs a tab space at start |
||
| endif | ||
|
|
||
| @echo "Running image with $(CONTAINER_TOOL)" | ||
|
|
||
| ifdef DOCKER_CMD | ||
| ${CONTAINER_TOOL} run --rm -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}/:/workspace ${REGISTRYNS}/${BINNAME}:${VERSION} | ||
| else | ||
| ${CONTAINER_TOOL} run --rm -it -p 8080:8080 --network=bridge ${REGISTRYNS}/${BINNAME}:${VERSION} | ||
|
There was a problem hiding this comment. @rmarting Do we need to run with -it flag for it to work? There was a problem hiding this comment. No, we don't. I use it normally but TBH for this use case it could be not needed. There was a problem hiding this comment. Would be good to remove it, since the api container will be running in non interactive mode. There was a problem hiding this comment. It makes sense. Done! |
||
| endif | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line needs a tab space at start
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!