From 26aecf095f65377360956caa85df4baa98710107 Mon Sep 17 00:00:00 2001
From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Date: Wed, 7 Oct 2020 16:28:51 +0800
Subject: [PATCH] Refine Dockerfile (#274)

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2431d3b7..8d21eb20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,12 @@
 # STEP 1 build executable binary
 ############################
 FROM golang:alpine AS builder
+
 RUN apk update && apk add --no-cache git bash wget curl
-WORKDIR /go/src/v2ray.com/core
+WORKDIR /build
 RUN git clone --progress https://github.com/v2fly/v2ray-core.git . && \
-    bash ./release/user-package.sh nosource noconf codename=$(git describe --tags) buildname=docker-fly abpathtgz=/tmp/v2ray.tgz
+    bash ./release/user-package.sh nosource noconf codename=$(git describe --abbrev=0 --tags) buildname=docker-fly abpathtgz=/tmp/v2ray.tgz
+
 ############################
 # STEP 2 build a small image
 ############################
@@ -20,4 +22,3 @@ RUN apk update && apk add ca-certificates && \
 #ENTRYPOINT ["/usr/bin/v2ray/v2ray"]
 ENV PATH /usr/bin/v2ray:$PATH
 CMD ["v2ray", "-config=/etc/v2ray/config.json"]
-