Merge pull request #2510 from iwankgb/enabling_unit_tests_in_podman

Ability to run unit tests in podman

Makefile

@@ -32,10 +32,12 @@ test:
 	@$(GO) test -short -race $(pkgs)
 	@cd cmd && $(GO) test -short -race $(cmd_pkgs)
 
-docker-test:
+container-test:
-	@echo ">> runinng tests in docker"
+	@echo ">> runinng tests in a container"
-	@./build/unit-in-docker.sh
+	@./build/unit-in-container.sh
 
+docker-test: container-test
+	@echo "docker-test target is deprecated, use container-test instead"
 
 test-integration:
 	GO_FLAGS="-race" ./build/build.sh

build/unit-in-container.sh

@@ -16,6 +16,15 @@
 
 set -e
 
+CONTAINER_ENGINE=$(command -v docker || true)
+if [ "$CONTAINER_ENGINE" == "" ]; then
+  CONTAINER_ENGINE=$(command -v podman || true)
+fi
+if [ "$CONTAINER_ENGINE" == "" ]; then
+  echo "Unable to find docker and podman. Exiting."
+  exit 1
+fi
+
 function run_tests() {
   BUILD_CMD="go test $GO_FLAGS $(go list $GO_FLAGS ./... | grep -v 'vendor\|integration' | tr '\n' ' ') && \
     cd cmd && go test $GO_FLAGS $(go list $GO_FLAGS ./... | grep -v 'vendor\|integration' | tr '\n' ' ')"
@@ -24,7 +33,7 @@ function run_tests() {
     $BUILD_CMD"
   fi
 
-  docker run --rm \
+  $CONTAINER_ENGINE run --rm \
     -w /go/src/github.com/google/cadvisor \
     -v ${PWD}:/go/src/github.com/google/cadvisor \
     golang:${GOLANG_VERSION} \