Cleanup make

Author: stefanprodan

.gitignore

@@ -19,3 +19,4 @@ release/
 build/
 gcloud/
 dist/
+bin/

Makefile

@@ -1,114 +1,31 @@
-# Makefile for releasing Alpine multi-arch Docker images
+# Makefile for releasing podinfo
 #
 # The release version is controlled from pkg/version
 
-EMPTY:=
-SPACE:=$(EMPTY) $(EMPTY)
-COMMA:=$(EMPTY),$(EMPTY)
 NAME:=podinfo
 DOCKER_REPOSITORY:=stefanprodan
 DOCKER_IMAGE_NAME:=$(DOCKER_REPOSITORY)/$(NAME)
-GITREPO:=github.com/stefanprodan/k8s-podinfo
 GITCOMMIT:=$(shell git describe --dirty --always)
 VERSION:=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"')
-LINUX_ARCH:=arm arm64 ppc64le s390x amd64
-PLATFORMS:=$(subst $(SPACE),$(COMMA),$(foreach arch,$(LINUX_ARCH),linux/$(arch)))
 
-.PHONY: build
-build:
-	@echo Cleaning old builds
-	@rm -rf build && mkdir build
-	@echo Building: linux/$(LINUX_ARCH)  $(VERSION) ;\
-	for arch in $(LINUX_ARCH); do \
-	    mkdir -p build/linux/$$arch && CGO_ENABLED=0 GOOS=linux GOARCH=$$arch go build -ldflags="-s -w -X $(GITREPO)/pkg/version.REVISION=$(GITCOMMIT)" -o build/linux/$$arch/$(NAME) ./cmd/$(NAME) ;\
-	    cp -r ui/ build/linux/$$arch/ui;\
-	done
-
-.PHONY: tar
-tar: build
-	@echo Cleaning old releases
-	@rm -rf release && mkdir release
-	for arch in $(LINUX_ARCH); do \
-	    tar -zcf release/$(NAME)_$(VERSION)_linux_$$arch.tgz -C build/linux/$$arch $(NAME) ;\
-	done
-
-.PHONY: docker-build
-docker-build: tar
-	# Steps:
-	# 1. Copy appropriate podinfo binary to build/docker/linux/<arch>
-	# 2. Copy Dockerfile to build/docker/linux/<arch>
-	# 3. Replace base image from alpine:latest to <arch>/alpine:latest
-	# 4. Comment RUN in Dockerfile
-	# <arch>:
-	# arm: arm32v6
-	# arm64: arm64v8
-	rm -rf build/docker
-	@for arch in $(LINUX_ARCH); do \
-	    mkdir -p build/docker/linux/$$arch ;\
-	    tar -xzf release/$(NAME)_$(VERSION)_linux_$$arch.tgz -C build/docker/linux/$$arch ;\
-	    cp -r ui/ build/docker/linux/$$arch/ui;\
-	    if [ $$arch == amd64 ]; then \
-		cp Dockerfile build/docker/linux/$$arch ;\
-		cp Dockerfile build/docker/linux/$$arch/Dockerfile.in ;\
-	    else \
-		cp Dockerfile.build build/docker/linux/$$arch/Dockerfile ;\
-		cp Dockerfile.build build/docker/linux/$$arch/Dockerfile.in ;\
-	    case $$arch in \
-	        arm) \
-	            BASEIMAGE=arm32v6 ;\
-	            ;; \
-	        arm64) \
-	            BASEIMAGE=arm64v8 ;\
-	            ;; \
-	        *) \
-	            BASEIMAGE=$$arch ;\
-	            ;; \
-	        esac ;\
-	        sed -e "s/alpine:latest/$$BASEIMAGE\\/alpine:latest/" -e "s/^\\s*RUN/#RUN/" build/docker/linux/$$arch/Dockerfile.in > build/docker/linux/$$arch/Dockerfile ;\
-	    fi ;\
-	    docker build -t $(NAME) build/docker/linux/$$arch ;\
-	    docker tag $(NAME) $(DOCKER_IMAGE_NAME):$(NAME)-$$arch ;\
-	done
-
-.PHONY: docker-push
-docker-push:
-	@echo Pushing: $(VERSION) to $(DOCKER_IMAGE_NAME)
-	for arch in $(LINUX_ARCH); do \
-        docker push $(DOCKER_IMAGE_NAME):$(NAME)-$$arch ;\
-    done
-	manifest-tool push from-args --platforms $(PLATFORMS) --template $(DOCKER_IMAGE_NAME):podinfo-ARCH --target $(DOCKER_IMAGE_NAME):$(VERSION)
-	manifest-tool push from-args --platforms $(PLATFORMS) --template $(DOCKER_IMAGE_NAME):podinfo-ARCH --target $(DOCKER_IMAGE_NAME):latest
+run:
+	GO111MODULE=on go run cmd/podinfo/*
 
-.PHONY: quay-push
-quay-push:
-	@echo Pushing: $(VERSION) to quay.io/$(DOCKER_IMAGE_NAME):$(VERSION)
-	@docker build -t quay.io/$(DOCKER_IMAGE_NAME):$(VERSION) -f Dockerfile.ci . ; docker push quay.io/$(DOCKER_IMAGE_NAME):$(VERSION)
-
-.PHONY: clean
-clean:
-	rm -rf release
-	rm -rf build
+test:
+	GO111MODULE=on go test -v -race ./...
 
-.PHONY: gcr-build
-gcr-build:
-	docker build -t gcr.io/$(DOCKER_IMAGE_NAME):$(VERSION) -f Dockerfile.ci .
+build:
+	GO111MODULE=on GIT_COMMIT=$$(git rev-list -1 HEAD) && GO111MODULE=on CGO_ENABLED=0 go build  -ldflags "-s -w -X github.com/stefanprodan/podinfo/pkg/version.REVISION=$${GIT_COMMIT}" -a -o ./bin/podinfo ./cmd/podinfo/*
+	GO111MODULE=on GIT_COMMIT=$$(git rev-list -1 HEAD) && GO111MODULE=on CGO_ENABLED=0 go build  -ldflags "-s -w -X github.com/stefanprodan/podinfo/pkg/version.REVISION=$${GIT_COMMIT}" -a -o ./bin/podcli ./cmd/podcli/*
 
-.PHONY: test
-test:
-	go test -v -race ./...
+build-charts:
+	helm lint charts/*
+	helm package charts/*
 
-.PHONY: dep
-dep:
-	go get -u github.com/golang/dep/cmd/dep
-	go get -u github.com/estesp/manifest-tool
+build-container:
+	docker build -t $(DOCKER_IMAGE_NAME):$(VERSION) .
 
-.PHONY: charts
-charts:
-	cd charts/ && helm package podinfo/
-	cd charts/ && helm package podinfo-istio/
-	cd charts/ && helm package loadtest/
-	cd charts/ && helm package ambassador/
-	cd charts/ && helm package grafana/
-	cd charts/ && helm package ngrok/
-	mv charts/*.tgz docs/
-	helm repo index docs --url https://stefanprodan.github.io/k8s-podinfo --merge ./docs/index.yaml
+push-container:
+	docker push $(DOCKER_IMAGE_NAME):$(VERSION)
+	docker tag $(DOCKER_IMAGE_NAME):$(VERSION) quay.io/$(DOCKER_IMAGE_NAME):$(VERSION)
+	docker push quay.io/$(DOCKER_IMAGE_NAME):$(VERSION)