Update dependencies

Also use module-aware go install to install version-pinned Go tooling,
instead of using tools/tools.go.

Signed-off-by: Jason Hall <jasonhall@redhat.com>

Makefile

@@ -176,23 +176,23 @@ $(BUILD_DIR)/darwin/lifecycle/launcher:
 
 install-goimports:
 	@echo "> Installing goimports..."
-	cd tools && $(GOCMD) install golang.org/x/tools/cmd/goimports
+	$(GOCMD) install golang.org/x/tools/cmd/goimports@v0.1.2
 
 install-yj:
 	@echo "> Installing yj..."
-	cd tools && $(GOCMD) install github.com/sclevine/yj
+	$(GOCMD) install github.com/sclevine/yj@v0.0.0-20200815061347-554173e71934
 
 install-mockgen:
 	@echo "> Installing mockgen..."
-	cd tools && $(GOCMD) install github.com/golang/mock/mockgen
+	$(GOCMD) install github.com/golang/mock/mockgen@v1.5.0
 
 install-golangci-lint:
 	@echo "> Installing golangci-lint..."
-	cd tools && $(GOCMD) install github.com/golangci/golangci-lint/cmd/golangci-lint
+	$(GOCMD) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.40.1 
 
 lint: install-golangci-lint
 	@echo "> Linting code..."
-	@golangci-lint run -c golangci.yaml
+	golangci-lint run -c golangci.yaml
 
 generate: install-mockgen
 	@echo "> Generating..."

go.mod

@@ -2,29 +2,28 @@ module github.com/buildpacks/lifecycle
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 // indirect
 	github.com/apex/log v1.9.0
-	github.com/buildpacks/imgutil v0.0.0-20210513150455-55e42b288ec8
-	github.com/containerd/containerd v1.3.3 // indirect
-	github.com/docker/cli v0.0.0-20200312141509-ef2f64abbd37 // indirect
-	github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7
+	github.com/buildpacks/imgutil v0.0.0-20210609210403-3145c7480cde
+	github.com/docker/docker v20.10.7+incompatible
+	github.com/docker/docker-credential-helpers v0.6.4 // indirect
 	github.com/golang/mock v1.5.0
-	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/google/go-cmp v0.5.6
-	github.com/google/go-containerregistry v0.5.1
+	github.com/google/go-containerregistry v0.5.2-0.20210604130445-3bfab55f3bd9
 	github.com/heroku/color v0.0.6
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/mattn/go-isatty v0.0.13 // indirect
+	github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2 // indirect
+	github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/sclevine/spec v1.4.0
-	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
-	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
-	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
-	golang.org/x/text v0.3.5 // indirect
-	google.golang.org/protobuf v1.25.0 // indirect
+	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	golang.org/x/sys v0.0.0-20210608053332-aa57babbf139
+	google.golang.org/genproto v0.0.0-20210610141715-e7a9b787a5a4 // indirect
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
-	gotest.tools/v3 v3.0.2 // indirect
+	k8s.io/code-generator v0.19.7 // indirect
+	k8s.io/gengo v0.0.0-20201113003025-83324d819ded // indirect
 )
 
-replace golang.org/x/sys => golang.org/x/sys v0.0.0-20200523222454-059865788121
-
 go 1.15