From e3aa2bdf485b599270e7aae21af2f913cd2f99e7 Mon Sep 17 00:00:00 2001 From: vcptr <51714622+vcptr@users.noreply.github.com> Date: Thu, 31 Oct 2019 11:44:57 +0800 Subject: [PATCH] adjust args --- Dockerfile | 4 ++-- release/user-package.sh | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 847868aa..3424bfd6 100644 --- 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 index c582e4d8..8c6b3945 100755 --- 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