adjust args

shadowgp · Oct 31, 2019 · bec564b · bec564b
1 parent 4da588d
commit bec564b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,8 +4,8 @@
 FROM golang:alpine AS builder
 RUN apk update && apk add --no-cache git bash wget
 WORKDIR /go/src/v2ray.com/core
-RUN git clone --progress --depth=1 --branch dockerdev https://github.com/v2fly/v2ray-core.git . && \
-    bash -x ./release/user-package.sh nosource noconf abpathtgz=/tmp/v2ray.tgz
+RUN git clone --progress --depth=1 https://github.com/v2fly/v2ray-core.git . && \
+    bash ./release/user-package.sh nosource noconf abpathtgz=/tmp/v2ray.tgz
 ############################
 # STEP 2 build a small image
 ############################

diff --git a/release/user-package.sh b/release/user-package.sh
@@ -138,6 +138,12 @@ case $arg in
 	abpathtgz=*)
 		pkg=${arg##abpathtgz=}
 		;;
+	codename=*)
+		CODENAME=${arg##codename=}
+		;;
+	buildname=*)
+		BUILDNAME=${arg##buildname=}
+		;;
 esac
 done
 
@@ -146,6 +152,8 @@ if [[ $nosource != 1 ]]; then
 fi
 
 export GOOS GOARCH
+echo "Build ARGS: GOOS=${GOOS} GOARCH=${GOARCH} CODENAME=${CODENAME} BUILDNAME=${BUILDNAME}"
+echo "PKG ARGS: pkg=${pkg}"
 build_v2
 
 if [[ $nodat != 1 ]]; then