adjust args

pull/2056/head
vcptr 2019-10-31 11:44:57 +08:00
parent 0d99c3f942
commit 82745be6fd
2 changed files with 10 additions and 2 deletions

View File

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

View File

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