From b896912dcfb14141e76fdcdaf437752de3320001 Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Wed, 5 Dec 2018 10:47:55 -0600
Subject: [PATCH] version detection travis friendly

---
 Dockerfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 800cd9b..6233095 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,11 +12,6 @@ ARG TRAVIS_PULL_REQUEST
 ARG TRAVIS_PULL_REQUEST_SHA
 ARG TRAVIS_REPO_SLUG
 ARG TRAVIS_TAG
-ARG DRONE
-ARG DRONE_TAG
-ARG DRONE_COMMIT
-ARG DRONE_BRANCH
-ARG DRONE_PULL_REQUEST
 
 WORKDIR /go/src/github.com/umputun/rss2twitter
 ADD . /go/src/github.com/umputun/rss2twitter
@@ -38,7 +33,9 @@ RUN if [ -z "$COVERALLS_TOKEN" ] ; then \
     else goveralls -coverprofile=.cover/cover.out -service=travis-ci -repotoken $COVERALLS_TOKEN || echo "coverall failed!"; fi
 
 RUN \
-    version=$(/script/git-rev.sh) && \
+    if [ -z "$TRAVIS" ] ; then \
+    echo "runs outside of travis" && version=$(/script/git-rev.sh); \
+    else version=${TRAVIS_TAG}${TRAVIS_BRANCH}${TRAVIS_PULL_REQUEST}-${TRAVIS_COMMIT:0:7}-$(date +%Y%m%dT%H:%M:%S); fi && \
     echo "version=$version" && \
     go build -o rss2twitter -ldflags "-X main.revision=${version} -s -w" ./app