From f99197dcf9e5f84bd3f9ebb40b9e611314845932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zlatko=20=C4=8Calu=C5=A1i=C4=87?= <zcalusic@bitsync.net>
Date: Sun, 21 Jan 2018 21:01:09 +0100
Subject: [PATCH] Update Makefile

- use latest Golang alpine image for building
- tag and push specific version of container
---
 Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 933e2cd..1d7716d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@
 
 DOCKER_IMAGE ?= restic/rest-server
 
+REST_SERVER_VERSION := $(strip $(shell cat VERSION))
+
 .PHONY: default rest-server install uninstall docker_build docker_push clean
 
 default: rest-server
@@ -19,16 +21,18 @@ uninstall:
 	sudo rm -f /usr/local/bin/rest-server
 
 docker_build:
-	docker pull golang:1.9.1-alpine
+	docker pull golang:alpine
 	docker run --rm -it \
 		-v $(CURDIR):/go/src/github.com/restic/rest-server \
 		-w /go/src/github.com/restic/rest-server \
-		golang:1.9.1-alpine \
+		golang:alpine \
 		go run build.go
-	docker pull alpine:3.6
-	docker build -t $(DOCKER_IMAGE) .
+	docker pull alpine
+	docker build -t $(DOCKER_IMAGE):$(REST_SERVER_VERSION) .
+	docker tag $(DOCKER_IMAGE):$(REST_SERVER_VERSION) $(DOCKER_IMAGE):latest
 
 docker_push:
+	docker push $(DOCKER_IMAGE):$(REST_SERVER_VERSION)
 	docker push $(DOCKER_IMAGE):latest
 
 clean: