From 05e32fe3300be3b9d574b745f8fe220fbc4462d7 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bertrand.gouny@osixia.net>
Date: Thu, 6 Jul 2017 14:40:23 +0200
Subject: [PATCH] v1.3.5-1

---
 Makefile         | 23 ++++++++++++++---------
 image/Dockerfile |  4 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 64cbd3e..36d6668 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
 NAME = osixia/keepalived
-VERSION = 1.3.5-1-1
+VERSION = 1.3.5-1
 
-.PHONY: all build build-nocache test tag_latest release
-
-all: build
+.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 
 build:
 	docker build -t $(NAME):$(VERSION) --rm image
@@ -14,10 +12,17 @@ build-nocache:
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 
-tag_latest:
+tag-latest:
 	docker tag $(NAME):$(VERSION) $(NAME):latest
 
-release: build test tag_latest
-	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	docker push $(NAME)
-	@echo "*** Don't forget to run 'twgit release/hotfix finish' :)"
+push:
+	docker push $(NAME):$(VERSION)
+
+push-latest:
+	docker push $(NAME):latest
+
+release: build test tag_latest push push_latest
+
+git-tag-version: release
+	git tag -a v$(VERSION) -m "v$(VERSION)"
+	git push origin v$(VERSION)
diff --git a/image/Dockerfile b/image/Dockerfile
index 7a69b86..ca08a7f 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,10 +1,10 @@
 # Use osixia/light-baseimage
 # sources: https://github.com/osixia/docker-light-baseimage
-FROM osixia/alpine-light-baseimage:0.1.2
+FROM osixia/alpine-light-baseimage:0.1.4
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version
-ENV KEEPALIVED_VERSION 1.3.5
+ARG KEEPALIVED_VERSION=1.3.5
 
 RUN addgroup -S keepalived_script && adduser -D -S -G keepalived_script keepalived_script