diff --git a/Dockerfile b/Dockerfile index af013de..f59c1dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # Build the manager binary -FROM golang:1.14 as builder +FROM golang:1.15 as builder ## GOLANG env -ARG GOPROXY="https://proxy.golang.org,direct" +ARG GOPROXY="https://proxy.golang.org|direct" ARG GO111MODULE="on" ARG CGO_ENABLED=0 ARG GOOS=linux diff --git a/Makefile b/Makefile index a4faeb6..d6b4ed1 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,7 @@ repo-full-name: @echo ${REPO_FULL_NAME} compile: - @echo ${MAKEFILE_PATH} - go build -a -ldflags "-X main.versionID=${VERSION} -X ${SELECTOR_PKG_VERSION_VAR}=${VERSION}" -tags="aeis${GOOS}" -o ${BUILD_DIR_PATH}/${BIN} ${MAKEFILE_PATH}/cmd/main.go + go build -a -ldflags "-s -w -X main.versionID=${VERSION} -X ${SELECTOR_PKG_VERSION_VAR}=${VERSION}" -tags="aeis${GOOS}" -o ${BUILD_DIR_PATH}/${BIN} ${MAKEFILE_PATH}/cmd/main.go clean: rm -rf ${BUILD_DIR_PATH}/ && go clean -testcache ./... @@ -110,5 +109,4 @@ release: build-binaries build-docker-images push-docker-images upload-resources- test: spellcheck shellcheck unit-test license-test go-report-card-test e2e-test output-validation-test readme-codeblock-test help: - @echo $(CURDIR) @grep -E '^[a-zA-Z_-]+:.*$$' $(MAKEFILE_LIST) | sort diff --git a/README.md b/README.md index 5eb8dcb..fbfbb2b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@
-
+
diff --git a/go.mod b/go.mod
index e4bec4e..f8a6262 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/aws/amazon-ec2-instance-selector
-go 1.14
+go 1.15
require (
github.com/aws/aws-sdk-go v1.31.12