From cbe9fca1c6332999b9d5a90fc416050ae28afd2d Mon Sep 17 00:00:00 2001
From: sneak <sneak@sneak.berlin>
Date: Fri, 9 Dec 2022 00:51:19 +0100
Subject: [PATCH] use drone env to set GITREV_BUILD

---
 .dockerignore | 1 +
 .drone.yml    | 4 +++-
 Dockerfile    | 4 ++--
 bin/gitrev.sh | 6 ++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 290e90f..ca812e4 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
 *.tmp
 *.dockerimage
+.git
diff --git a/.drone.yml b/.drone.yml
index 894c7eb..f8b7eaa 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,11 +7,13 @@ steps:
   network_mode: bridge
   settings:
     repo: sneak/mfer
+    build_args_from_env: [ DRONE_COMMIT_SHA ]
     dry_run: true
     custom_dns: [ 116.202.204.30 ]
     tags:
-      - ${DRONE_COMMIT_SHA}
+      - ${DRONE_COMMIT_SHA:0:7}
       - ${DRONE_BRANCH}
+      - latest
 - name: notify
   image: plugins/slack
   settings:
diff --git a/Dockerfile b/Dockerfile
index 4da29bb..79673cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@
 FROM sneak/builder:2022-12-08 AS builder
 ENV DEBIAN_FRONTEND noninteractive
 WORKDIR /build
-COPY ./.git /build/.git
 COPY ./Makefile ./.golangci.yml ./go.mod ./go.sum /build/
 COPY ./vendor.tzst /build/vendor.tzst
 COPY ./modcache.tzst /build/modcache.tzst
@@ -13,6 +12,7 @@ COPY ./bin/gitrev.sh ./bin/gitrev.sh
 COPY ./mfer ./mfer
 COPY ./cmd ./cmd
 ARG GITREV unknown
+ARG DRONE_COMMIT_SHA unknown
 
 RUN mkdir -p "$(go env GOMODCACHE)" && cd "$(go env GOMODCACHE)" && \
     zstdmt -d --stdout /build/modcache.tzst | tar xf - && \
@@ -24,7 +24,7 @@ RUN \
     zstdmt -d --stdout /build/vendor.tzst | tar xf - && rm /build/vendor.tzst && \
     cd .. && \
     make mfer.cmd
-RUN rm -rf /build/vendor /build/.git && go mod vendor && tar -c . | zstdmt -19 > /src.tzst
+RUN rm -rf /build/vendor && go mod vendor && tar -c . | zstdmt -19 > /src.tzst
 ################################################################################
 #2345678911234567892123456789312345678941234567895123456789612345678971234567898
 ################################################################################
diff --git a/bin/gitrev.sh b/bin/gitrev.sh
index 02f6821..cc44344 100644
--- a/bin/gitrev.sh
+++ b/bin/gitrev.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
+#
+if [[ ! -z "$DRONE_COMMIT_SHA" ]]; then
+    echo "${DRONE_COMMIT_SHA:0:7}"
+    exit 0
+fi
+
 if [[ ! -z "$GITREV" ]]; then
     echo $GITREV
 else