Skip to content

Commit

Permalink
Merge c00f7f0 into 4e6e50f
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles Carlfjord committed Mar 9, 2021
2 parents 4e6e50f + c00f7f0 commit 37bd355
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14.0 AS BUILDER
FROM golang:1.16.0 AS BUILDER
WORKDIR /go/src/github.com/jtblin/kube2iam
ENV ARCH=linux
ENV CGO_ENABLED=0
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ GOLANGCI_LINT_DEADLINE ?= 180
DOCKER_BUILD_FLAGS :=

setup:
go get -v -u golang.org/x/tools/cmd/goimports
go install golang.org/x/tools/cmd/goimports
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.23.8
go get -v -u github.com/jstemmer/go-junit-report
go get -v github.com/mattn/goveralls
go install github.com/jstemmer/go-junit-report
go install github.com/mattn/goveralls

build: *.go fmt
go build -o build/bin/$(ARCH)/$(BINARY_NAME) $(GOBUILD_VERSION_ARGS) github.com/jtblin/$(BINARY_NAME)/cmd
Expand Down

0 comments on commit 37bd355

Please sign in to comment.