Add choffmeister/git-describe-semver to build imgs

refs GH-891
atc0005 · Feb 23, 2023 · 51319a0 · 51319a0
1 parent 6400e7e
commit 51319a0
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -76,10 +76,11 @@ The following linting tools are included in the `go-ci-stable`,
 The following build tools are included in all `*-build*` images *except* for
 the `*-mirror-*` images:
 
-| Build tool                                                | Version   |
-| --------------------------------------------------------- | --------- |
-| [`tc-hib/go-winres`](https://github.com/tc-hib/go-winres) | `v0.3.1`  |
-| [`goreleaser/nfpm`](https://github.com/goreleaser/nfpm)   | `v2.26.0` |
+| Build tool                                                                                | Version   |
+| ----------------------------------------------------------------------------------------- | --------- |
+| [`tc-hib/go-winres`](https://github.com/tc-hib/go-winres)                                 | `v0.3.1`  |
+| [`goreleaser/nfpm`](https://github.com/goreleaser/nfpm)                                   | `v2.26.0` |
+| [`choffmeister/git-describe-semver`](https://github.com/choffmeister/git-describe-semver) | `v0.3.9`  |
 
 ### Matrix images
 
@@ -291,8 +292,9 @@ official release is also provided for further review.
     - [fatih/errwrap](https://github.com/fatih/errwrap)
 
 - Build Tools
-  - [`tc-hib/go-winres`](https://github.com/tc-hib/go-winres)
-  - [`goreleaser/nfpm`](https://github.com/goreleaser/nfpm)
+  - [tc-hib/go-winres](https://github.com/tc-hib/go-winres)
+  - [goreleaser/nfpm](https://github.com/goreleaser/nfpm)
+  - [choffmeister/git-describe-semver](https://github.com/choffmeister/git-describe-semver)
 
 - Images
   - <https://fabianlee.org/2020/01/26/golang-using-multi-stage-builds-to-create-clean-docker-images/>

diff --git a/oldstable/build/release/Dockerfile b/oldstable/build/release/Dockerfile
@@ -30,6 +30,9 @@ ENV GO_WINRES_VERSION="v0.3.1"
 # https://github.com/goreleaser/nfpm/releases
 ENV NFPM_VERSION="v2.26.0"
 
+# https://github.com/choffmeister/git-describe-semver/releases
+ENV GIT_DESCRIBE_SEMVER_VERSION="v0.3.9"
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     bsdmainutils="${APT_BSDMAINUTILS_VERSION}" \
@@ -44,4 +47,6 @@ RUN apt-get update \
     && echo "Installing nfpm@${NFPM_VERSION}" \
     && go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${NFPM_VERSION} \
     && nfpm --version \
+    && go install github.com/choffmeister/git-describe-semver@${GIT_DESCRIBE_SEMVER_VERSION} \
+    && go version -m $(which git-describe-semver) | awk '$1 == "mod" { print $3 }' \
     && go clean -cache -modcache
diff --git a/stable/build/alpine-x64/Dockerfile b/stable/build/alpine-x64/Dockerfile
@@ -41,6 +41,9 @@ ENV GO_WINRES_VERSION="v0.3.1"
 # https://github.com/goreleaser/nfpm/releases
 ENV NFPM_VERSION="v2.26.0"
 
+# https://github.com/choffmeister/git-describe-semver/releases
+ENV GIT_DESCRIBE_SEMVER_VERSION="v0.3.9"
+
 # Install specific version of packages
 # RUN apk update && \
 #     apk add --no-cache \
@@ -80,4 +83,6 @@ RUN apk add --no-cache \
     && echo "Installing nfpm@${NFPM_VERSION}" \
     && go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${NFPM_VERSION} \
     && nfpm --version \
+    && go install github.com/choffmeister/git-describe-semver@${GIT_DESCRIBE_SEMVER_VERSION} \
+    && go version -m $(which git-describe-semver) | awk '$1 == "mod" { print $3 }' \
     && go clean -cache -modcache
diff --git a/stable/build/alpine-x86/Dockerfile b/stable/build/alpine-x86/Dockerfile
@@ -40,6 +40,9 @@ ENV GO_WINRES_VERSION="v0.3.1"
 # https://github.com/goreleaser/nfpm/releases
 ENV NFPM_VERSION="v2.26.0"
 
+# https://github.com/choffmeister/git-describe-semver/releases
+ENV GIT_DESCRIBE_SEMVER_VERSION="v0.3.9"
+
 # Install specific version of packages
 # RUN apk update && \
 #     apk add --no-cache \
@@ -79,4 +82,6 @@ RUN apk add --no-cache \
     && echo "Installing nfpm@${NFPM_VERSION}" \
     && go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${NFPM_VERSION} \
     && nfpm --version \
+    && go install github.com/choffmeister/git-describe-semver@${GIT_DESCRIBE_SEMVER_VERSION} \
+    && go version -m $(which git-describe-semver) | awk '$1 == "mod" { print $3 }' \
     && go clean -cache -modcache
diff --git a/stable/build/cgo-mingw-w64/Dockerfile b/stable/build/cgo-mingw-w64/Dockerfile
@@ -33,6 +33,9 @@ ENV GO_WINRES_VERSION="v0.3.1"
 # https://github.com/goreleaser/nfpm/releases
 ENV NFPM_VERSION="v2.26.0"
 
+# https://github.com/choffmeister/git-describe-semver/releases
+ENV GIT_DESCRIBE_SEMVER_VERSION="v0.3.9"
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     bsdmainutils="${APT_BSDMAINUTILS_VERSION}" \
@@ -49,4 +52,6 @@ RUN apt-get update \
     && echo "Installing nfpm@${NFPM_VERSION}" \
     && go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${NFPM_VERSION} \
     && nfpm --version \
+    && go install github.com/choffmeister/git-describe-semver@${GIT_DESCRIBE_SEMVER_VERSION} \
+    && go version -m $(which git-describe-semver) | awk '$1 == "mod" { print $3 }' \
     && go clean -cache -modcache
diff --git a/stable/build/release/Dockerfile b/stable/build/release/Dockerfile
@@ -30,6 +30,9 @@ ENV GO_WINRES_VERSION="v0.3.1"
 # https://github.com/goreleaser/nfpm/releases
 ENV NFPM_VERSION="v2.26.0"
 
+# https://github.com/choffmeister/git-describe-semver/releases
+ENV GIT_DESCRIBE_SEMVER_VERSION="v0.3.9"
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     bsdmainutils="${APT_BSDMAINUTILS_VERSION}" \
@@ -44,4 +47,6 @@ RUN apt-get update \
     && echo "Installing nfpm@${NFPM_VERSION}" \
     && go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${NFPM_VERSION} \
     && nfpm --version \
+    && go install github.com/choffmeister/git-describe-semver@${GIT_DESCRIBE_SEMVER_VERSION} \
+    && go version -m $(which git-describe-semver) | awk '$1 == "mod" { print $3 }' \
     && go clean -cache -modcache
diff --git a/unstable/build/release/Dockerfile b/unstable/build/release/Dockerfile
@@ -31,6 +31,9 @@ ENV GO_WINRES_VERSION="v0.3.1"
 # https://github.com/goreleaser/nfpm/releases
 ENV NFPM_VERSION="v2.26.0"
 
+# https://github.com/choffmeister/git-describe-semver/releases
+ENV GIT_DESCRIBE_SEMVER_VERSION="v0.3.9"
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     bsdmainutils="${APT_BSDMAINUTILS_VERSION}" \
@@ -45,4 +48,6 @@ RUN apt-get update \
     && echo "Installing nfpm@${NFPM_VERSION}" \
     && go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${NFPM_VERSION} \
     && nfpm --version \
+    && go install github.com/choffmeister/git-describe-semver@${GIT_DESCRIBE_SEMVER_VERSION} \
+    && go version -m $(which git-describe-semver) | awk '$1 == "mod" { print $3 }' \
     && go clean -cache -modcache