|
|
@@ -76,13 +76,12 @@ update-glide:
|
|
|
|
|
|
clean:
|
|
|
rm -f dist/flanneld*
|
|
|
- rm -f dist/libpthread*
|
|
|
rm -f dist/*.aci
|
|
|
rm -f dist/*.docker
|
|
|
rm -f dist/*.tar.gz
|
|
|
|
|
|
## Create a docker image on disk for a specific arch and tag
|
|
|
-dist/flanneld-$(TAG)-$(ARCH).docker: dist/flanneld-$(ARCH) dist/iptables-$(ARCH) dist/libpthread.so.0-$(ARCH)
|
|
|
+dist/flanneld-$(TAG)-$(ARCH).docker: dist/flanneld-$(ARCH) dist/iptables-$(ARCH)
|
|
|
docker build -f Dockerfile.$(ARCH) -t $(REGISTRY):$(TAG)-$(ARCH) .
|
|
|
docker save -o dist/flanneld-$(TAG)-$(ARCH).docker $(REGISTRY):$(TAG)-$(ARCH)
|
|
|
|
|
|
@@ -121,12 +120,6 @@ dist/flanneld-$(ARCH):
|
|
|
mv dist/flanneld dist/flanneld-$(ARCH) && \
|
|
|
file dist/flanneld-$(ARCH)'
|
|
|
|
|
|
-## Busybox images need updated libs. Pull them out of the kube-cross image
|
|
|
-dist/libpthread.so.0-$(ARCH) dist/libc.so.6-$(ARCH) dist/ld64.so.1-$(ARCH):
|
|
|
- docker run --rm -v $(CURDIR):/host gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) cp $(LIB_DIR)/libc-2.23.so /host/dist/libc.so.6-$(ARCH)
|
|
|
- docker run --rm -v $(CURDIR):/host gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) cp $(LIB_DIR)/ld-2.23.so /host/dist/ld64.so.1-$(ARCH)
|
|
|
- docker run --rm -v $(CURDIR):/host gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) cp $(LIB_DIR)/libpthread.so.0 /host/dist/libpthread.so.0-$(ARCH)
|
|
|
-
|
|
|
## Build an architecture specific iptables binary
|
|
|
dist/iptables-$(ARCH):
|
|
|
docker run -e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) \
|
|
|
@@ -202,7 +195,7 @@ install:
|
|
|
minikube-start:
|
|
|
minikube start --network-plugin cni
|
|
|
|
|
|
-minikube-build-image: dist/iptables-amd64 dist/libpthread.so.0-amd64
|
|
|
+minikube-build-image: dist/iptables-amd64
|
|
|
CGO_ENABLED=1 go build -v -o dist/flanneld-amd64
|
|
|
# Make sure the minikube docker is being used "eval $(minikube docker-env)"
|
|
|
sh -c 'eval $$(minikube docker-env) && docker build -f Dockerfile.amd64 -t flannel/minikube .'
|
Tom Denham