From 03cbf5f9f406e2c3a18dc919d248c8ff9ea86bd2 Mon Sep 17 00:00:00 2001
From: Quan TRAN <account@itscaro.me>
Date: Wed, 6 Apr 2022 00:35:23 +0200
Subject: [PATCH] [fix] bump go 1.18 & optional TAG definition in makefile

Signed-off-by: Quan TRAN <account@itscaro.me>
---
 Dockerfile | 2 +-
 Makefile   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index efa7432f..0880ba50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18 as builder
+FROM golang:1.18-alpine as builder
 
 RUN apk add --no-cache make git
 WORKDIR /workspace/helmfile
diff --git a/Makefile b/Makefile
index 46328875..5fcc5c80 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ tools:
 	go get -u github.com/tcnksm/ghr github.com/mitchellh/gox
 .PHONY: tools
 
-TAG  = $(shell git describe --tags --abbrev=0 HEAD)
+TAG  ?= $(shell git describe --tags --abbrev=0 HEAD)
 LAST = $(shell git describe --tags --abbrev=0 HEAD^)
 BODY = "`git log ${LAST}..HEAD --oneline --decorate` `printf '\n\#\#\# [Build Info](${BUILD_URL})'`"