diff --git a/.circleci/config.yml b/.circleci/config.yml index 2036eac612597..be198abbda595 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner:v41089396-d65d75ec + - image: gcr.io/datadoghq/agent-circleci-runner:v44692678-b2bf92cc environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31a61eabdd19c..33bce23bd4533 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,15 +164,15 @@ variables: # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v41089396-d65d75ec + DATADOG_AGENT_BUILDIMAGES: v44692678-b2bf92cc DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v41089396-d65d75ec + DATADOG_AGENT_WINBUILDIMAGES: v44692678-b2bf92cc DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v41089396-d65d75ec + DATADOG_AGENT_ARMBUILDIMAGES: v44692678-b2bf92cc DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v41089396-d65d75ec + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v44692678-b2bf92cc DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v41089396-d65d75ec + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v44692678-b2bf92cc DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: c0962c7d diff --git a/.go-version b/.go-version index 013173af5e9bc..87b26e8b1aa0e 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.6 +1.22.7 diff --git a/devenv/scripts/Install-DevEnv.ps1 b/devenv/scripts/Install-DevEnv.ps1 index d35e0df5b7a65..c9fff932ce2a7 100644 --- a/devenv/scripts/Install-DevEnv.ps1 +++ b/devenv/scripts/Install-DevEnv.ps1 @@ -45,7 +45,7 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola $ErrorActionPreference = 'Stop' $ProgressPreference = 'SilentlyContinue' -$go_version = "1.22.6" +$go_version = "1.22.7" Write-Host -ForegroundColor Green "Installing go $go_version" $gozip = "https://dl.google.com/go/go$go_version.windows-amd64.zip" diff --git a/docs/dev/agent_dev_env.md b/docs/dev/agent_dev_env.md index 0929f27d19be0..1bec6dc33d5fe 100644 --- a/docs/dev/agent_dev_env.md +++ b/docs/dev/agent_dev_env.md @@ -138,7 +138,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als ### Golang -You must [install Golang](https://golang.org/doc/install) version `1.22.6` or +You must [install Golang](https://golang.org/doc/install) version `1.22.7` or higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need. diff --git a/releasenotes/notes/bump-go-to-1.22.7-925020d09a164060.yaml b/releasenotes/notes/bump-go-to-1.22.7-925020d09a164060.yaml new file mode 100644 index 0000000000000..54e50ffbf243f --- /dev/null +++ b/releasenotes/notes/bump-go-to-1.22.7-925020d09a164060.yaml @@ -0,0 +1,4 @@ +--- +enhancements: +- | + Agents are now built with Go ``1.22.7``. diff --git a/tasks/go.py b/tasks/go.py index e1821f5f22037..a7d6fd5594ba4 100644 --- a/tasks/go.py +++ b/tasks/go.py @@ -446,7 +446,7 @@ def tidy(ctx): @task def check_go_version(ctx): go_version_output = ctx.run('go version') - # result is like "go version go1.22.6 linux/amd64" + # result is like "go version go1.22.7 linux/amd64" running_go_version = go_version_output.stdout.split(' ')[2] with open(".go-version") as f: diff --git a/test/fakeintake/Dockerfile b/test/fakeintake/Dockerfile index 4e2b2eb9ab7d7..aa77ba5a45231 100644 --- a/test/fakeintake/Dockerfile +++ b/test/fakeintake/Dockerfile @@ -2,7 +2,7 @@ # syntax=docker/dockerfile:1 ## Build -FROM golang:1.22.6-alpine3.20 AS build +FROM golang:1.22.7-alpine3.20 AS build # need gcc to build with CGO_ENABLED=1 # need musl-dev to get stdlib.h diff --git a/tools/gdb/Dockerfile b/tools/gdb/Dockerfile index 4adfa70473a9a..5dfd0b06eda82 100644 --- a/tools/gdb/Dockerfile +++ b/tools/gdb/Dockerfile @@ -6,7 +6,7 @@ RUN rm -vf /etc/ssl/openssl.cnf RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y gdb build-essential strace less vim # Install go -RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.22.6.linux-amd64.tar.gz +RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.22.7.linux-amd64.tar.gz RUN tar xzvf golang.tgz RUN ln -s /go /goroot