fix: set version dynamically + bump deps

Signed-off-by: Manfred Touron <[email protected]>
moul · Jun 7, 2020 · c30c813 · wd · Jun 11, 2020 · c30c813
1 parent 65e9f6d
commit c30c813
Show file tree

Hide file tree

Showing 13 changed files with 346 additions and 57 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,7 +1,7 @@
 *#
 *~
 .#*
-.git/
+#.git/
 Dockerfile
 ./assh
 dist/

diff --git a/AUTHORS b/AUTHORS
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@ COPY            . ./
 RUN             make install
 
 # minimalist runtime
-FROM alpine:3.11
+FROM alpine:3.12
 LABEL           org.label-schema.build-date=$BUILD_DATE \
                 org.label-schema.name="assh" \
                 org.label-schema.description="" \

diff --git a/Makefile b/Makefile
@@ -10,6 +10,11 @@ PRE_LINT_STEPS += generate
 PRE_TIDY_STEPS += generate
 PRE_BUMPDEPS_STEPS += generate
 
+VERSION ?= `git describe --tags --always`
+VCS_REF ?= `git rev-parse --short HEAD`
+
+GO_INSTALL_OPTS = -ldflags="-X 'moul.io/assh/v2/pkg/version.Version=$(VERSION)' -X 'moul.io/assh/v2/pkg/version.VcsRef=$(VCS_REF)' "
+
 include rules.mk
 
 .PHONY: generate

diff --git a/contrib/completion/bash_autocomplete b/contrib/completion/bash_autocomplete
diff --git a/go.mod b/go.mod
-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     *#
     *~
     .#*
-    .git/
+    #.git/
     Dockerfile
     ./assh
     dist/
@@ Expand Down @@