From 040c836def28f368ef6f26e075951a326f6ff260 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 15 Dec 2023 11:38:49 -0500 Subject: [PATCH] [updatecli] Bump Golang version to 1.21.5 (#12191) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update Dockerfile with Golang version 1.21.5 Made with ❤️️ by updatecli * chore: Update version.asciidoc with Golang version 1.21.5 Made with ❤️️ by updatecli * chore: Update .go-version with Golang version 1.21.5 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- .go-version | 2 +- docs/version.asciidoc | 2 +- packaging/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.go-version b/.go-version index 20a1265cf39..ce2dd53570b 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.4 +1.21.5 diff --git a/docs/version.asciidoc b/docs/version.asciidoc index 5f7517f251e..4a0cf36c40c 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: master -:go-version: 1.21.4 +:go-version: 1.21.5 :python: 3.7 :docker: 1.12 :docker-compose: 1.11 diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index b9f9a09c165..53beb1661ca 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=ubuntu:22.04 # Build the apm-server binary. The golang image version is kept # up to date with go.mod by Makefile. -FROM golang:1.21.4 as builder +FROM golang:1.21.5 as builder WORKDIR /src COPY go.mod go.sum /src/ COPY internal/glog/go.mod /src/internal/glog/go.mod