From 0110d8e4120e226160fda2378c0f0813d1f5e870 Mon Sep 17 00:00:00 2001
From: Florian Lehner <florian.lehner@elastic.co>
Date: Mon, 14 Oct 2024 10:51:26 +0200
Subject: [PATCH 1/2] docker: use Go version as defined in the package

Debian does provide a different Go version than set in go.mod. Install Go
from upstream instead of Debian packages.

Signed-off-by: Florian Lehner <florian.lehner@elastic.co>
---
 Dockerfile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b2f68715..125a0705 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,11 +8,20 @@ RUN cross_debian_arch=$(uname -m | sed -e 's/aarch64/amd64/'  -e 's/x86_64/arm64
     cross_pkg_arch=$(uname -m | sed -e 's/aarch64/x86-64/' -e 's/x86_64/aarch64/'); \
     apt-get update -y && \
     apt-get dist-upgrade -y && \
-    apt-get install -y wget make git clang-16 golang unzip \
+    apt-get install -y wget make git clang-16 unzip libc6-dev g++ gcc pkgconf \
         gcc-${cross_pkg_arch}-linux-gnu libc6-${cross_debian_arch}-cross && \
     apt-get clean autoclean && \
     apt-get autoremove --yes
 
+COPY go.mod /tmp/go.mod
+# Extract Go version from go.mod
+RUN GO_VERSION=$(grep -oP 'go \K[0-9]+\.[0-9]+\.[0-9]+' /tmp/go.mod) && \
+    wget -qO- https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xz
+# Set Go environment variables
+ENV GOPATH="/agent/go"
+ENV GOCACHE="/agent/.cache"
+ENV PATH="/usr/local/go/bin:$PATH"
+
 RUN wget -qO- https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
     | sh -s -- -b $(go env GOPATH)/bin v1.56.2
 
@@ -32,12 +41,7 @@ RUN
     && find "$INSTALL_DIR/include" -type f -exec chmod +r {} \;                    \
     && rm "$PB_FILE"
 
-# The docker image is built as root - make binaries available to user.
-RUN mv /root/go/bin/* /usr/local/bin/
-
-ENV GOPATH=/agent/go
-ENV GOCACHE=/agent/.cache
-
-RUN echo "export PATH=\"\$PATH:\$(go env GOPATH)/bin\"" >> ~/.bashrc
+# Append to /etc/profile for login shells
+RUN echo 'export PATH="/usr/local/go/bin:$PATH"' >> /etc/profile
 
 ENTRYPOINT ["/bin/bash", "-l", "-c"]

From dc6c0a6d5cb666b2581e0b35ca3f1935bfdce05c Mon Sep 17 00:00:00 2001
From: Florian Lehner <florianl@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:08:16 +0200
Subject: [PATCH 2/2] Update Dockerfile

Co-authored-by: Christos Kalkanis <christos.kalkanis@elastic.co>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 125a0705..6f5a5201 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN cross_debian_arch=$(uname -m | sed -e 's/aarch64/amd64/'  -e 's/x86_64/arm64
 
 COPY go.mod /tmp/go.mod
 # Extract Go version from go.mod
-RUN GO_VERSION=$(grep -oP 'go \K[0-9]+\.[0-9]+\.[0-9]+' /tmp/go.mod) && \
+RUN GO_VERSION=$(grep -oPm1 '^go \K([[:digit:].]+)' /tmp/go.mod) && \
     wget -qO- https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xz
 # Set Go environment variables
 ENV GOPATH="/agent/go"