Skip to content

Commit 52557a0

Browse files
authored
upgrade to go 1.15 (#49)
1 parent 7cad3b7 commit 52557a0

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Build the manager binary
2-
FROM golang:1.14 as builder
2+
FROM golang:1.15 as builder
33

44
## GOLANG env
5-
ARG GOPROXY="https://proxy.golang.org,direct"
5+
ARG GOPROXY="https://proxy.golang.org|direct"
66
ARG GO111MODULE="on"
77
ARG CGO_ENABLED=0
88
ARG GOOS=linux

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ repo-full-name:
2222
@echo ${REPO_FULL_NAME}
2323

2424
compile:
25-
@echo ${MAKEFILE_PATH}
26-
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
25+
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
2726

2827
clean:
2928
rm -rf ${BUILD_DIR_PATH}/ && go clean -testcache ./...
@@ -110,5 +109,4 @@ release: build-binaries build-docker-images push-docker-images upload-resources-
110109
test: spellcheck shellcheck unit-test license-test go-report-card-test e2e-test output-validation-test readme-codeblock-test
111110

112111
help:
113-
@echo $(CURDIR)
114112
@grep -E '^[a-zA-Z_-]+:.*$$' $(MAKEFILE_LIST) | sort

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h4>A CLI tool and go library which recommends instance types based on resource criteria like vcpus and memory.</h4>
44

55
<p>
6-
<a href="https://golang.org/doc/go1.14">
6+
<a href="https://golang.org/doc/go1.15">
77
<img src="https://img.shields.io/github/go-mod/go-version/aws/amazon-ec2-instance-selector?color=blueviolet" alt="go-version">
88
</a>
99
<a href="https://opensource.org/licenses/Apache-2.0">

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/aws/amazon-ec2-instance-selector/v2
22

3-
go 1.14
3+
go 1.15
44

55
require (
66
github.com/aws/aws-sdk-go v1.31.12

0 commit comments

Comments
 (0)