Merge pull request #158 from dlipovetsky/build-with-make

Build with make
kubernetes-retired · Apr 27, 2020 · e4a5ffd · e4a5ffd
2 parents 6938f5f + 800de39
commit e4a5ffd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ GIT_STORAGE_MOUNT := $(shell source ./git_utils.sh; container_git_storage_mount)
 default: $(BIN)
 
 container-build:
-	docker run --rm -e VERSION_OVERRIDE=${VERSION_OVERRIDE} -v $(PWD):$(PACKAGE_GOPATH) -w $(PACKAGE_GOPATH) $(GIT_STORAGE_MOUNT) golang:1.11 /bin/bash -c "make ensure && make"
+	docker run --rm -e VERSION_OVERRIDE=${VERSION_OVERRIDE} -v $(PWD):$(PACKAGE_GOPATH) -w $(PACKAGE_GOPATH) $(GIT_STORAGE_MOUNT) golang:1.12 /bin/bash -c "make ensure && make"
 
 $(BIN):
 	GO111MODULE=on go build -ldflags "$(LDFLAGS)"

diff --git a/README.md b/README.md
@@ -26,9 +26,15 @@ For major project goals, see the [roadmap](ROADMAP.md)
 
 ### Building
 
-```
-go get -u sigs.k8s.io/etcdadm
-```
+1. Clone the git repository.
+1. Build on the host:
+   ```
+   make etcdadm
+   ```
+1. Build in a container, using docker:
+   ```
+   make container-build
+   ```
 
 ### Creating a new cluster