From 02d298aac63faf2fdb22baad2e21c194c43dc479 Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Sat, 7 Jul 2018 14:16:52 -0500
Subject: [PATCH] remove pullreq from drone, remove .git and default version to
 local

---
 .drone.yml | 9 ---------
 Dockerfile | 8 ++------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 7f9a4c04..a7cf619a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -54,15 +54,6 @@ pipeline:
         exclude: [master, release/*]
         event: push
 
-  docker_pullrequest:
-    image: docker
-    commands:
-      - docker build .
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    when:
-      event: pull_request
-
   deploy:
     image: appleboy/drone-ssh
     host: remark42.com
diff --git a/Dockerfile b/Dockerfile
index 044c803c..88f20e60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,9 +20,7 @@ ARG DRONE_BRANCH
 ARG DRONE_PULL_REQUEST
 
 WORKDIR /go/src/github.com/umputun/remark/backend
-
 ADD backend /go/src/github.com/umputun/remark/backend
-ADD .git /go/src/github.com/umputun/remark/.git
 
 RUN cd app && go test ./...
 
@@ -38,12 +36,10 @@ RUN if [ -z "$COVERALLS_TOKEN" ] ; then \
 
 # get revision from git. if DRONE presented use DRONE_* git env to make version
 RUN \
-    cd /go/src/github.com/umputun/remark && version=$(/script/git-rev.sh) && cd backend \
-    echo "git version=$version" && \  
     if [ -z "$DRONE" ] ; then \
-    echo "runs outside of drone" ; \
+    echo "runs outside of drone" && version="local"; \
     else version=${DRONE_TAG}${DRONE_BRANCH}${DRONE_PULL_REQUEST}-${DRONE_COMMIT:0:7}-$(date +%Y%m%d-%H:%M:%S); fi && \
-    echo "final version=$version" && \  
+    echo "version=$version" && \
     go build -o remark -ldflags "-X main.revision=${version} -s -w" ./app