add global() Selector: cherry picked from projectcalico/libcalico-go#…

…1229
andreas-p · Jun 7, 2021 · 4ef7c26 · 4ef7c26
1 parent 82dc6be
commit 4ef7c26
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,10 @@
 all: build
 
 ENVVAR = GOOS=linux GOARCH=amd64
-TAG = v0.1.6
+TAG = v0.1.7
 APP_NAME = calico-accountant
+REPO = andreas-p
+IMAGE_TAG = $(REPO)/$(APP_NAME):$(TAG)
 
 clean:
 	rm -f $(APP_NAME)
@@ -19,6 +21,10 @@ test-unit: clean fmt build
 # Make the container using docker multi-stage build process
 # So you don't necessarily have to install golang to make the container
 container:
-	docker build -f Dockerfile -t monzo/$(APP_NAME):$(TAG) .
+	docker build -f Dockerfile -t $(IMAGE_TAG) .
+
+
+binary: container
+	docker run --rm $(IMAGE_TAG) cat /calico-accountant >$(APP_NAME)
 
 .PHONY: all clean fmt build container
diff --git a/vendor/github.com/coreos/etcd/cmd/etcd b/vendor/github.com/coreos/etcd/cmd/etcd
diff --git a/vendor/github.com/projectcalico/libcalico-go/lib/backend/syncersv1/updateprocessors/rules.go b/vendor/github.com/projectcalico/libcalico-go/lib/backend/syncersv1/updateprocessors/rules.go
diff --git a/vendor/github.com/projectcalico/libcalico-go/lib/selector/parser/ast.go b/vendor/github.com/projectcalico/libcalico-go/lib/selector/parser/ast.go
diff --git a/vendor/github.com/projectcalico/libcalico-go/lib/selector/parser/parser.go b/vendor/github.com/projectcalico/libcalico-go/lib/selector/parser/parser.go
diff --git a/vendor/github.com/projectcalico/libcalico-go/lib/selector/tokenizer/tokenizer.go b/vendor/github.com/projectcalico/libcalico-go/lib/selector/tokenizer/tokenizer.go