diff --git a/.travis.yml b/.travis.yml index 304d6bd5006..d432525a868 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: go go_import_path: github.com/aws/amazon-ecs-agent sudo: false go: - - 1.11 + - 1.12 matrix: include: diff --git a/misc/agent-introspection-validator/build-in-docker b/misc/agent-introspection-validator/build-in-docker index f2843b4fab1..cbef48bc67b 100755 --- a/misc/agent-introspection-validator/build-in-docker +++ b/misc/agent-introspection-validator/build-in-docker @@ -21,4 +21,4 @@ docker run \ -v ${AGENT_VENDOR_DIR}:/gopath/src \ -e CGO_ENABLED=0 \ -e GOPATH=/go:/gopath \ - golang:1.9 go build -a -x -ldflags '-s' -o /out/agent-introspection-validator /in/agent-introspection-validator.go + golang:1.12 go build -a -x -ldflags '-s' -o /out/agent-introspection-validator /in/agent-introspection-validator.go diff --git a/misc/appmesh-plugin-validator/Dockerfile b/misc/appmesh-plugin-validator/Dockerfile index b6c3139198b..0156daa3e8a 100644 --- a/misc/appmesh-plugin-validator/Dockerfile +++ b/misc/appmesh-plugin-validator/Dockerfile @@ -10,7 +10,7 @@ # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either # express or implied. See the License for the specific language governing # permissions and limitations under the License. -FROM golang:1.9 +FROM golang:1.12 MAINTAINER Amazon Web Services, Inc. COPY appmesh-plugin-validator / diff --git a/misc/appmesh-plugin-validator/build-in-docker b/misc/appmesh-plugin-validator/build-in-docker index 5aebdb8511a..aad036d1e37 100755 --- a/misc/appmesh-plugin-validator/build-in-docker +++ b/misc/appmesh-plugin-validator/build-in-docker @@ -22,4 +22,4 @@ docker run \ -e CGO_ENABLED=0 \ -e GO111MODULE=on \ -w /in \ - golang:1.11.5 go build -a -x -ldflags '-s' -o /out/appmesh-plugin-validator /in/appmesh-plugin-validator.go + golang:1.12 go build -a -x -ldflags '-s' -o /out/appmesh-plugin-validator /in/appmesh-plugin-validator.go diff --git a/misc/container-metadata-file-validator/build-in-docker b/misc/container-metadata-file-validator/build-in-docker index 934bec6a2d6..7e2f8305bfc 100755 --- a/misc/container-metadata-file-validator/build-in-docker +++ b/misc/container-metadata-file-validator/build-in-docker @@ -21,4 +21,4 @@ docker run \ -v ${AGENT_VENDOR_DIR}:/gopath/src \ -e CGO_ENABLED=0 \ -e GOPATH=/go:/gopath \ - golang:1.9 go build -a -x -ldflags '-s' -o /out/container-metadata-file-validator /in/container-metadata-file-validator.go + golang:1.12 go build -a -x -ldflags '-s' -o /out/container-metadata-file-validator /in/container-metadata-file-validator.go diff --git a/misc/elastic-inference-validator/build-in-docker b/misc/elastic-inference-validator/build-in-docker index 063d487538e..aea939ca39b 100755 --- a/misc/elastic-inference-validator/build-in-docker +++ b/misc/elastic-inference-validator/build-in-docker @@ -21,4 +21,4 @@ docker run \ -v ${AGENT_VENDOR_DIR}:/gopath/src \ -e CGO_ENABLED=0 \ -e GOPATH=/go:/gopath \ - golang:1.9 go build -a -x -ldflags '-s' -o /out/elastic-inference-validator /in/elastic-inference-validator.go + golang:1.12 go build -a -x -ldflags '-s' -o /out/elastic-inference-validator /in/elastic-inference-validator.go diff --git a/misc/gremlin/Makefile b/misc/gremlin/Makefile index 4ed15af160e..8ddb72b09cf 100644 --- a/misc/gremlin/Makefile +++ b/misc/gremlin/Makefile @@ -15,7 +15,7 @@ all: gremlin image gremlin: gremlin.go - docker run -v $(shell pwd):/out -v $(shell pwd)/gremlin.go:/in/gremlin.go -e CGO_ENABLED=0 golang:1.9 go build -a -x -ldflags '-s' -o /out/gremlin /in/gremlin.go + docker run -v $(shell pwd):/out -v $(shell pwd)/gremlin.go:/in/gremlin.go -e CGO_ENABLED=0 golang:1.12 go build -a -x -ldflags '-s' -o /out/gremlin /in/gremlin.go image: gremlin @./docker-image diff --git a/misc/netkitten/Makefile b/misc/netkitten/Makefile index 10a976ecbc1..f3875ddb36f 100644 --- a/misc/netkitten/Makefile +++ b/misc/netkitten/Makefile @@ -15,7 +15,7 @@ all: netkitten image netkitten: - docker run -v $(shell pwd):/out -v $(shell pwd)/netkitten.go:/in/netkitten.go -e CGO_ENABLED=0 golang:1.9 go build -a -installsuffix cgo -ldflags '-s' -o /out/netkitten /in/netkitten.go + docker run -v $(shell pwd):/out -v $(shell pwd)/netkitten.go:/in/netkitten.go -e CGO_ENABLED=0 golang:1.12 go build -a -installsuffix cgo -ldflags '-s' -o /out/netkitten /in/netkitten.go image: netkitten @./docker-image diff --git a/misc/taskmetadata-validator/build-in-docker b/misc/taskmetadata-validator/build-in-docker index 9cadead33ab..f68f8fe07da 100755 --- a/misc/taskmetadata-validator/build-in-docker +++ b/misc/taskmetadata-validator/build-in-docker @@ -21,4 +21,4 @@ docker run \ -v ${AGENT_VENDOR_DIR}:/gopath/src \ -e CGO_ENABLED=0 \ -e GOPATH=/go:/gopath \ - golang:1.9 go build -a -x -ldflags '-s' -o /out/taskmetadata-validator /in/taskmetadata-validator.go + golang:1.12 go build -a -x -ldflags '-s' -o /out/taskmetadata-validator /in/taskmetadata-validator.go diff --git a/misc/telemetry/Dockerfile b/misc/telemetry/Dockerfile index eb5dca24808..fa493f07384 100644 --- a/misc/telemetry/Dockerfile +++ b/misc/telemetry/Dockerfile @@ -10,7 +10,7 @@ # on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either # express or implied. See the License for the specific language governing # permissions and limitations under the License. -FROM golang:1.9 +FROM golang:1.12 WORKDIR /gopath diff --git a/misc/v3-task-endpoint-validator/build-in-docker b/misc/v3-task-endpoint-validator/build-in-docker index c5e406d73d4..bf86e9366ce 100755 --- a/misc/v3-task-endpoint-validator/build-in-docker +++ b/misc/v3-task-endpoint-validator/build-in-docker @@ -21,4 +21,4 @@ docker run \ -v ${AGENT_VENDOR_DIR}:/gopath/src \ -e CGO_ENABLED=0 \ -e GOPATH=/go:/gopath \ - golang:1.9 go build -a -x -ldflags '-s' -o /out/v3-task-endpoint-validator /in/v3-task-endpoint-validator.go + golang:1.12 go build -a -x -ldflags '-s' -o /out/v3-task-endpoint-validator /in/v3-task-endpoint-validator.go diff --git a/scripts/dockerfiles/Dockerfile.build b/scripts/dockerfiles/Dockerfile.build index c92745f4d31..2d3bd903295 100644 --- a/scripts/dockerfiles/Dockerfile.build +++ b/scripts/dockerfiles/Dockerfile.build @@ -11,7 +11,7 @@ # express or implied. See the License for the specific language governing # permissions and limitations under the License. -FROM golang:1.9 +FROM golang:1.12 MAINTAINER Amazon Web Services, Inc. RUN apt-get update && \ diff --git a/scripts/dockerfiles/Dockerfile.buildECSCNIPlugins b/scripts/dockerfiles/Dockerfile.buildECSCNIPlugins index 1ede471e3c1..4de6dd02075 100644 --- a/scripts/dockerfiles/Dockerfile.buildECSCNIPlugins +++ b/scripts/dockerfiles/Dockerfile.buildECSCNIPlugins @@ -11,7 +11,7 @@ # express or implied. See the License for the specific language governing # permissions and limitations under the License. -FROM golang:1.9 +FROM golang:1.12 MAINTAINER Amazon Web Services, Inc. RUN mkdir -p /go/src/github.com/aws/ diff --git a/scripts/dockerfiles/Dockerfile.cleanbuild b/scripts/dockerfiles/Dockerfile.cleanbuild index a1421aec805..8aae84b10a1 100644 --- a/scripts/dockerfiles/Dockerfile.cleanbuild +++ b/scripts/dockerfiles/Dockerfile.cleanbuild @@ -11,7 +11,7 @@ # express or implied. See the License for the specific language governing # permissions and limitations under the License. -FROM golang:1.9 +FROM golang:1.12 MAINTAINER Amazon Web Services, Inc. COPY ./scripts/cleanbuild /scripts/cleanbuild