diff --git a/build/ks-apigateway/Dockerfile b/build/ks-apigateway/Dockerfile index 85b1e7d37..61700244d 100644 --- a/build/ks-apigateway/Dockerfile +++ b/build/ks-apigateway/Dockerfile @@ -10,11 +10,11 @@ FROM golang:1.12 as ks-apigateway-builder COPY / /go/src/kubesphere.io/kubesphere WORKDIR /go/src/kubesphere.io/kubesphere -RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux GOARCH=amd64 go build -i -ldflags '-w -s' -o ks-apigateway cmd/ks-apigateway/apiserver.go && \ +RUN CGO_ENABLED=0 GO111MODULE=on GOOS=linux GOARCH=amd64 GOFLAGS=-mod=vendor go build -i -ldflags '-w -s' -o ks-apigateway cmd/ks-apigateway/apiserver.go && \ go run tools/cmd/doc-gen/main.go --output=install/swagger-ui/api.json FROM alpine:3.9 RUN apk add --update ca-certificates && update-ca-certificates COPY --from=ks-apigateway-builder /go/src/kubesphere.io/kubesphere/ks-apigateway /usr/local/bin/ COPY --from=ks-apigateway-builder /go/src/kubesphere.io/kubesphere/install/swagger-ui /var/static/swagger-ui -CMD ["sh"] \ No newline at end of file +CMD ["sh"] diff --git a/build/ks-apiserver/Dockerfile b/build/ks-apiserver/Dockerfile index ae6171773..6b83416dc 100644 --- a/build/ks-apiserver/Dockerfile +++ b/build/ks-apiserver/Dockerfile @@ -10,7 +10,7 @@ FROM golang:1.12 as ks-apiserver-builder COPY / /go/src/kubesphere.io/kubesphere WORKDIR /go/src/kubesphere.io/kubesphere -RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux GOARCH=amd64 go build -i -ldflags '-w -s' -o ks-apiserver cmd/ks-apiserver/apiserver.go +RUN CGO_ENABLED=0 GO111MODULE=on GOOS=linux GOARCH=amd64 GOFLAGS=-mod=vendor go build -i -ldflags '-w -s' -o ks-apiserver cmd/ks-apiserver/apiserver.go FROM alpine:3.9 RUN apk add --update ca-certificates && update-ca-certificates diff --git a/build/ks-controller-manager/Dockerfile b/build/ks-controller-manager/Dockerfile index 45b1025c7..ed8a1cc13 100644 --- a/build/ks-controller-manager/Dockerfile +++ b/build/ks-controller-manager/Dockerfile @@ -10,7 +10,7 @@ FROM golang:1.12 as controller-manager-builder COPY / /go/src/kubesphere.io/kubesphere WORKDIR /go/src/kubesphere.io/kubesphere -RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build --ldflags "-extldflags -static" -o controller-manager ./cmd/controller-manager/ +RUN CGO_ENABLED=0 GO111MODULE=on GOOS=linux GOARCH=amd64 GOFLAGS=-mod=vendor go build --ldflags "-extldflags -static" -o controller-manager ./cmd/controller-manager/ FROM alpine:3.7 RUN apk add --update ca-certificates && update-ca-certificates diff --git a/build/ks-iam/Dockerfile b/build/ks-iam/Dockerfile index a8bb9c17e..3e65a47e8 100644 --- a/build/ks-iam/Dockerfile +++ b/build/ks-iam/Dockerfile @@ -10,7 +10,7 @@ FROM golang:1.12 as ks-iam-builder COPY / /go/src/kubesphere.io/kubesphere WORKDIR /go/src/kubesphere.io/kubesphere -RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux GOARCH=amd64 go build -i -ldflags '-w -s' -o ks-iam cmd/ks-iam/apiserver.go +RUN CGO_ENABLED=0 GO111MODULE=on GOOS=linux GOARCH=amd64 GOFLAGS=-mod=vendor go build -i -ldflags '-w -s' -o ks-iam cmd/ks-iam/apiserver.go FROM alpine:3.9 RUN apk add --update ca-certificates && update-ca-certificates diff --git a/hack/docker_build.sh b/hack/docker_build.sh index 6d68bdbe9..0163be392 100755 --- a/hack/docker_build.sh +++ b/hack/docker_build.sh @@ -7,9 +7,7 @@ REPO=kubespheredev TAG=latest # check if build was triggered by a travis cronjob -if [[ ! -v TRAVIS_EVENT_TYPE ]]; then - echo "TRAVIS_EVENT_TYPE is not set, treat as regular build" -elif [[ -z "$TRAVIS_EVENT_TYPE" ]]; then +if [[ -z "$TRAVIS_EVENT_TYPE" ]]; then echo "TRAVIS_EVENT_TYPE is empty, also normaly build" elif [ $TRAVIS_EVENT_TYPE == "cron" ]; then TAG=dev-$(date +%Y%m%d)