fix #18: separate docker backup and main publishing; optimize docker context

Author: kamilsk

.dockerignore

@@ -0,0 +1,16 @@
+# folders
+.github
+api
+bin
+docs
+env
+test
+third_party
+tools
+
+# files
+.gitattributes
+.gitignore
+.gitmodule
+Makefile
+README.md

Makefile

@@ -9,7 +9,6 @@ MODULE      = $(shell go list -m)
 PATHS       = $(shell go list ./... | sed -e "s|$(shell go list -m)/\{0,1\}||g")
 SHELL       = /bin/bash -euo pipefail
 TIMEOUT     = 1s
-VERSION     = 1.x
 
 export PATH := $(BINPATH):$(PATH)
 

env/make/docker.mk

@@ -1,14 +1,19 @@
-ifndef VERSION
-$(error Please define VERSION variable)
-endif
+IMAGE   = octopot/tablo
+BACKUP  = quay.io/octopot/tablo
+VERSION = 1.x
+
+.PHONY: docker-backup
+docker-backup:
+	@docker tag  $(IMAGE):$(VERSION)  $(BACKUP):$(VERSION)
+	@docker tag  $(IMAGE):latest      $(BACKUP):latest
+	@docker push $(BACKUP):$(VERSION)
+	@docker push $(BACKUP):latest
 
 .PHONY: docker-build
 docker-build:
 	docker build -f env/docker/service/Dockerfile \
-	             -t octopot/tablo:$(VERSION) \
-	             -t octopot/tablo:latest \
-	             -t quay.io/octopot/tablo:$(VERSION) \
-	             -t quay.io/octopot/tablo:latest \
+	             -t $(IMAGE):$(VERSION) \
+	             -t $(IMAGE):latest \
 	             --force-rm --no-cache --pull --rm \
 	             .
 
@@ -17,17 +22,15 @@ docker-publish: docker-build docker-push
 
 .PHONY: docker-push
 docker-push:
-	docker push octopot/tablo:$(VERSION)
-	docker push octopot/tablo:latest
-	docker push quay.io/octopot/tablo:$(VERSION)
-	docker push quay.io/octopot/tablo:latest
+	@docker push $(IMAGE):$(VERSION)
+	@docker push $(IMAGE):latest
 
 .PHONY: docker-run
 docker-run:
-	docker run --rm -it \
-	           --name tablo-dev \
-	           -p 8080:8080 \
-	           -p 8090:8090 \
-	           -p 8091:8091 \
-	           -p 8092:8092 \
-	           octopot/tablo:$(VERSION) run --with-monitoring --with-profiling
+	@docker run --rm -it \
+	            --name $(subst /,-,$(IMAGE))-dev \
+	            -p 8080:8080 \
+	            -p 8090:8090 \
+	            -p 8091:8091 \
+	            -p 8092:8092 \
+	            $(IMAGE):$(VERSION) run --with-monitoring --with-profiling