feat: Use docker or podman to build and run

.gitignore

@@ -37,3 +37,9 @@ __pycache__/
 .bundle/
 vendor/
 .ruby-version
+
+# Samples
+samples/**/*.project
+samples/**/*.classpath
+samples/**/*.gradle
+samples/**/*.settings

Makefile

@@ -60,6 +60,16 @@ LDFLAGS += -X github.com/konveyor/${BINNAME}/types/info.gitCommit=${GIT_COMMIT}
 LDFLAGS += -X github.com/konveyor/${BINNAME}/types/info.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
@@ -171,17 +181,29 @@ info: ## Get version info
 	 @echo "Git Commit:        ${GIT_COMMIT}"
 	 @echo "Git Tree State:    ${GIT_DIRTY}"
 
-# -- Docker --
+# -- Container Image --
 
 .PHONY: cbuild
-cbuild: ## Build docker image
-	docker 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} .
-	docker 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} .
-	docker tag ${REGISTRYNS}/${BINNAME}-builder:${VERSION} ${REGISTRYNS}/${BINNAME}-builder:latest
-	docker tag ${REGISTRYNS}/${BINNAME}:${VERSION} ${REGISTRYNS}/${BINNAME}:latest
+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 docker image
+cpush: ## Push container image
+ifndef CONTAINER_TOOL
+$(error No container tool (docker, podman) found in your environment. Please, install one)
+endif
+
+	@echo "Pushing image with $(CONTAINER_TOOL)"
+
 	# To help with reusing layers and hence speeding up build
-	docker push ${REGISTRYNS}/${BINNAME}-builder:${VERSION}
-	docker push ${REGISTRYNS}/${BINNAME}:${VERSION}
+	${CONTAINER_TOOL} push ${REGISTRYNS}/${BINNAME}-builder:${VERSION}
+	${CONTAINER_TOOL} push ${REGISTRYNS}/${BINNAME}:${VERSION}

README.md

@@ -4,10 +4,9 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/konveyor/move2kube)](https://goreportcard.com/report/github.com/konveyor/move2kube)
 [<img src="https://img.shields.io/badge/slack-konveyor/move2kube-green.svg?logo=slack">](https://kubernetes.slack.com/archives/CR85S82A2)
 
-
 # Move2Kube
 
-Move2Kube is a command-line tool that accelerates the process of re-platforming to Kubernetes/Openshift. It does so by analysing the environment and source artifacts, and asking guidance from the user when required. It allows customizations to enable generating the directory structure and artifacts in the format required for your project.
+Move2Kube is a command-line tool that accelerates the process of re-platforming to Kubernetes/Openshift. It does so by analyzing the environment and source artifacts, and asking guidance from the user when required. It allows customizations to enable generating the directory structure and artifacts in the format required for your project.
 
 ![Usage](./imgs/overview.png)
 
@@ -16,23 +15,26 @@ Move2Kube is a command-line tool that accelerates the process of re-platforming
 ### Using install script
 
 To install the latest stable version:
-```
+
+```shell
 bash <(curl https://raw.githubusercontent.com/konveyor/move2kube/main/scripts/install.sh)
 ```
 
 To install a specific version (for example version `v0.2.0-alpha.3`):
-```
+
+```shell
 MOVE2KUBE_TAG='v0.2.0-alpha.3' bash <(curl https://raw.githubusercontent.com/konveyor/move2kube/main/scripts/install.sh)
 ```
 
 To install the bleeding edge version:
-```
+
+```shell
 BLEEDING_EDGE='true' bash <(curl https://raw.githubusercontent.com/konveyor/move2kube/main/scripts/install.sh)
 ```
 
 ### Using Homebrew
 
-```
+```shell
 brew tap konveyor/move2kube
 brew install move2kube
 ```
@@ -41,16 +43,25 @@ brew install move2kube
 
 To bring up UI version:
 
-```
+Using `docker`:
+
+```shell
 docker run --rm -it -p 8080:8080 quay.io/konveyor/move2kube-ui:latest
 ```
+
+Using `podman`:
+
+```shell
+podman run --rm -it -p 8080:8080 quay.io/konveyor/move2kube-ui:latest
+```
+
 Then go to http://localhost:8080 in a browser
 
 More detailed instructions can be found in the [Move2Kube UI repo](https://github.com/konveyor/move2kube-ui#starting-the-ui)
 
 ## Usage
 
-`move2kube transform -s src` , where src is the folder containing the source artifacts.
+`move2kube transform -s src`, where `src` is the folder containing the source artifacts.
 
 Checkout the [Getting started](https://move2kube.konveyor.io/docs/getting-started) guide and [Tutorials](https://move2kube.konveyor.io/docs/tutorial) for more information.
 
@@ -91,7 +102,7 @@ To browse code [![Open in VSCode](https://open.vscode.dev/badges/open-in-vscode.
   * Kubernetes/Openshift Yamls
   * Helm charts
   * Kustomize
-  * Openshift Templates
+  * OpenShift Templates
   * Operator
   * Docker compose