|
| 1 | +TAG ?= $(shell gitmeta image tag) |
| 2 | +REPO ?= autonomy/cluster-api-provider-talos |
| 3 | + |
1 | 4 |
|
2 | 5 | # Image URL to use all building/pushing image targets
|
3 |
| -IMG ?= rsmitty/cluster-api-talos-controller:latest |
| 6 | +IMG ?= $(REPO):$(TAG) |
4 | 7 | # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
|
5 | 8 | CRD_OPTIONS ?= "crd:trivialVersions=true"
|
6 | 9 |
|
7 |
| -# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) |
8 |
| -ifeq (,$(shell go env GOBIN)) |
9 |
| -GOBIN=$(shell go env GOPATH)/bin |
10 |
| -else |
11 |
| -GOBIN=$(shell go env GOBIN) |
12 |
| -endif |
13 |
| - |
14 |
| -all: manager |
| 10 | +all: test docker-build |
15 | 11 |
|
16 | 12 | # Run tests
|
17 |
| -test: generate fmt vet manifests |
18 |
| - go test ./... -coverprofile cover.out |
| 13 | +test: |
| 14 | + docker build . --target $@ -t $(REPO):test |
19 | 15 |
|
20 | 16 | # Build manager binary
|
21 | 17 | manager: generate fmt vet
|
@@ -51,19 +47,24 @@ generate: controller-gen
|
51 | 47 | $(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths="./..."
|
52 | 48 |
|
53 | 49 | # Build the docker image
|
54 |
| -docker-build: generate fmt vet manifests |
55 |
| - docker build . -t ${IMG} |
| 50 | +docker-build: |
| 51 | + @docker build . -t $(REPO):$(TAG) |
56 | 52 |
|
57 | 53 | # Push the docker image
|
58 | 54 | docker-push:
|
59 |
| - docker push ${IMG} |
| 55 | + @docker tag $(REPO):$(TAG) $(REPO):latest |
| 56 | + @docker push $(REPO):$(TAG) |
| 57 | + @docker push $(REPO):latest |
| 58 | + |
| 59 | +login: |
| 60 | + @docker login --username "$(DOCKER_USERNAME)" --password "$(DOCKER_PASSWORD)" |
60 | 61 |
|
61 | 62 | # find or download controller-gen
|
62 | 63 | # download controller-gen if necessary
|
63 | 64 | controller-gen:
|
64 | 65 | ifeq (, $(shell which controller-gen))
|
65 | 66 | go get sigs.k8s.io/controller-tools/cmd/ [email protected]
|
66 |
| -CONTROLLER_GEN=$(GOBIN)/controller-gen |
| 67 | +CONTROLLER_GEN=$(GOPATH)/bin/controller-gen |
67 | 68 | else
|
68 | 69 | CONTROLLER_GEN=$(shell which controller-gen)
|
69 | 70 | endif
|
0 commit comments