Skip to content

Commit

Permalink
Merge pull request #8351 from johngmyers/automated-cherry-pick-of-#83…
Browse files Browse the repository at this point in the history
…43-upstream-release-1.17

Automated cherry pick of #8343: Fix crossbuild-nodeup-in-docker
  • Loading branch information
k8s-ci-robot committed Jan 16, 2020
2 parents 8c2af33 + 92991d4 commit 7f4c53e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,11 @@ crossbuild-nodeup: ${DIST}/linux/amd64/nodeup
crossbuild-nodeup-in-docker:
docker pull golang:${GOVERSION} # Keep golang image up to date
docker run --name=nodeup-build-${UNIQUE} -e STATIC_BUILD=yes -e VERSION=${VERSION} -v ${MAKEDIR}:/go/src/k8s.io/kops golang:${GOVERSION} make -C /go/src/k8s.io/kops/ crossbuild-nodeup
docker cp nodeup-build-${UNIQUE}:/go/.build .
docker start nodeup-build-${UNIQUE}
docker exec nodeup-build-${UNIQUE} chown -R ${UID}:${GID} /go/src/k8s.io/kops/.build
docker cp nodeup-build-${UNIQUE}:/go/src/k8s.io/kops/.build .
docker kill nodeup-build-${UNIQUE}
docker rm nodeup-build-${UNIQUE}

.PHONY: ${DIST}/darwin/amd64/kops
${DIST}/darwin/amd64/kops: ${BINDATA_TARGETS}
Expand Down

0 comments on commit 7f4c53e

Please sign in to comment.