Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: Use $(CURDIR) #662

Merged
merged 1 commit into from
Apr 11, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Makefile: Use CURDIR
The current makefile variable PWD is not defined in the makefile,
and leads to build errors.  Use CURDIR instead.

Fixes errors like these:

  docker: Error response from daemon: Invalid volume spec ":/go/src/github.com/coreos/flannel:ro"

Signed-off-by: Geoff Levand <[email protected]>
glevand committed Apr 10, 2017
commit 313ee9c8f0ffbe172a99ae1ad16aedb263925f3b
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -100,8 +100,8 @@ dist/flanneld-$(ARCH):
# valid values for $$ARCH are [amd64 arm arm64 ppc64le]
docker run -e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) \
-u $(shell id -u):$(shell id -g) \
-v ${PWD}:/go/src/github.com/coreos/flannel:ro \
-v ${PWD}/dist:/go/src/github.com/coreos/flannel/dist \
-v $(CURDIR):/go/src/github.com/coreos/flannel:ro \
-v $(CURDIR)/dist:/go/src/github.com/coreos/flannel/dist \
gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) /bin/bash -c '\
cd /go/src/github.com/coreos/flannel && \
CGO_ENABLED=1 make -e dist/flanneld && \
@@ -116,8 +116,8 @@ dist/libpthread.so.0-$(ARCH):
dist/iptables-$(ARCH):
docker run -e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) \
-u $(shell id -u):$(shell id -g) \
-v ${PWD}:/go/src/github.com/coreos/flannel:ro \
-v ${PWD}/dist:/go/src/github.com/coreos/flannel/dist \
-v $(CURDIR):/go/src/github.com/coreos/flannel:ro \
-v $(CURDIR)/dist:/go/src/github.com/coreos/flannel/dist \
gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) /bin/bash -c '\
curl -sSL http://www.netfilter.org/projects/iptables/files/iptables-$(IPTABLES_VERSION).tar.bz2 | tar -jxv && \
cd iptables-$(IPTABLES_VERSION) && \