Skip to content

Commit bb31084

Browse files
authored
Merge pull request #105 from mboersma/remove-deprecated-glide-flag
ref(Dockerfile,Jenkinsfile): remove deprecated glide flags
2 parents 27bab7c + 17d5b08 commit bb31084

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY glide.lock /go/src/github.com/deis/controller-sdk-go/
99

1010
WORKDIR /go/src/github.com/deis/controller-sdk-go
1111

12-
RUN glide install --strip-vcs --strip-vendor
12+
RUN glide install --strip-vendor
1313

1414
COPY ./_scripts /usr/local/bin
1515

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ node('linux') {
145145

146146
def build_script = "sh -c 'perl -i -0pe \"s/${pattern}/${replacement}/\" glide.yaml "
147147
build_script += "&& rm -rf glide.lock vendor/github.com/deis/controller-sdk-go "
148-
build_script += "&& glide install --update-vendored "
148+
build_script += "&& glide install "
149149
build_script += "&& make build-revision'"
150150
sh "docker pull ${wcli_image}"
151151
sh "docker run ${flags} -e GIT_TAG=csdk -e REVISION=${git_commit.take(7)} ${dist_dir} --rm ${wcli_image} ${build_script}"

0 commit comments

Comments
 (0)