diff --git a/.go-version b/.go-version index 166a50ffa2a..656fd0d7e1b 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.12.9 +1.12.12 diff --git a/Dockerfile b/Dockerfile index 1ba7ed1cc4a..6e93465c3a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.12.9 +FROM golang:1.12.12 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/README.md b/README.md index a9a52751b8e..9009dc76bd1 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ To get started with APM please see our [Getting Started Guide](https://www.elast ### Requirements -* [Golang](https://golang.org/dl/) 1.12.9 +* [Golang](https://golang.org/dl/) 1.12.12 ### Install diff --git a/changelogs/7.5.asciidoc b/changelogs/7.5.asciidoc index eae386f39ff..5c068b0402c 100644 --- a/changelogs/7.5.asciidoc +++ b/changelogs/7.5.asciidoc @@ -23,3 +23,4 @@ https://github.com/elastic/apm-server/compare/v7.4.1\...v7.5.0[View commits] - Add support for agent config GA {pull}2747[2747]. - Change ILM default policies to rollover after 30 days {pull}2798[2798]. - Introduce `apm-server.ilm.setup.overwrite` config option and stop overwriting by default {pull}2877[2877]. +- Upgrade Go to 1.12.12 {pull}2922[2922]. diff --git a/docs/version.asciidoc b/docs/version.asciidoc index 2da296cc203..aeeb4f7312e 100644 --- a/docs/version.asciidoc +++ b/docs/version.asciidoc @@ -1,6 +1,6 @@ // doc-branch can be: master, 8.0, 8.1, etc. :doc-branch: 7.x -:go-version: 1.12.9 +:go-version: 1.12.12 :python: 2.7.9 :docker: 1.12 :docker-compose: 1.11 @@ -14,4 +14,4 @@ include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[] :apm-ruby-ref-v: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} :apm-java-ref-v: https://www.elastic.co/guide/en/apm/agent/java/{apm-java-branch} :apm-go-ref-v: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} -:apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} \ No newline at end of file +:apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch}