diff --git a/.travis.yml b/.travis.yml index 2e01e91e..b9dc35a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required language: go go: -- 1.11.x +- 1.12.x services: - docker diff --git a/Dockerfile b/Dockerfile index da33fc79..85988a5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.11 +FROM golang:1.12 RUN mkdir -p /go/src/github.com/weaveworks/flagger/ diff --git a/Dockerfile.loadtester b/Dockerfile.loadtester index de95a5e6..238ad5c1 100644 --- a/Dockerfile.loadtester +++ b/Dockerfile.loadtester @@ -1,4 +1,4 @@ -FROM golang:1.11 AS hey-builder +FROM golang:1.12 AS hey-builder RUN mkdir -p /go/src/github.com/rakyll/hey/ diff --git a/docs/gitbook/install/flagger-install-on-eks-appmesh.md b/docs/gitbook/install/flagger-install-on-eks-appmesh.md index 79da4438..5e64dba8 100644 --- a/docs/gitbook/install/flagger-install-on-eks-appmesh.md +++ b/docs/gitbook/install/flagger-install-on-eks-appmesh.md @@ -111,7 +111,7 @@ The installer does the following: * registers the App Mesh mutating webhook * deploys the App Mesh webhook in `appmesh-system` namespace * deploys the App Mesh CRDs -* deploys the App Mesh controller `appmesh-system` namespace +* deploys the App Mesh controller in `appmesh-system` namespace * creates a mesh called `global` Verify that the global mesh is active: