Restructure

Makefile

@@ -1,14 +1,29 @@
+#
+#       Settings
+#
 
 
-all: build publish
+# Name of the docker image
+APP_NAME := code-formatter
+
+# Select the docker registry to use for the image
+DOCKER_REGISTRY := yoursystemcz
 
 
+# Describe current branch
+BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
+COMMIT = $(shell git rev-parse HEAD)
+GIT_TAG = $(shell git describe --tags --exact-match 2>/dev/null)
 
-build:
-	docker build -t yoursystemcz/code-formatter:latest .
+VERSION := $(or $(GIT_TAG),latest)
 
-publish:
-	docker push yoursystemcz/code-formatter:latest
 
-exec:
-	docker run --rm -it --entrypoint bash yoursystemcz/code-formatter:latest
+all : build release
+.PHONY : all
+
+
+build :
+	docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION) .
+
+release : build
+        docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)