From cb715c9a1fe545020d3ff5885bf5698fe749fdaf Mon Sep 17 00:00:00 2001
From: Ron Federman <73110295+RonFed@users.noreply.github.com>
Date: Thu, 1 Aug 2024 13:59:26 +0300
Subject: [PATCH] Update odiglet base image to use bookworm version (#1387)

Update the odiglet base image to a newer version of Debian.
One of the advantages of this upgrade is a newer version of clang and
llvm.
---
 odiglet/Dockerfile       | 2 +-
 odiglet/base.Dockerfile  | 2 +-
 odiglet/debug.Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/odiglet/Dockerfile b/odiglet/Dockerfile
index 5f61d27af..f6462bf57 100644
--- a/odiglet/Dockerfile
+++ b/odiglet/Dockerfile
@@ -67,7 +67,7 @@ RUN ARCH_SUFFIX=$(cat /tmp/arch_suffix) && \
     unzip opentelemetry-dotnet-instrumentation-linux-glibc-${ARCH_SUFFIX}.zip && \
     rm opentelemetry-dotnet-instrumentation-linux-glibc-${ARCH_SUFFIX}.zip
 
-FROM --platform=$BUILDPLATFORM keyval/odiglet-base:v1.4 AS builder
+FROM --platform=$BUILDPLATFORM keyval/odiglet-base:v1.5 AS builder
 WORKDIR /go/src/github.com/odigos-io/odigos
 # Copy local modules required by the build
 COPY api/ api/
diff --git a/odiglet/base.Dockerfile b/odiglet/base.Dockerfile
index b9bf6e4fe..b015d0d92 100644
--- a/odiglet/base.Dockerfile
+++ b/odiglet/base.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.2-bullseye as builder
+FROM golang:1.22.5-bookworm as builder
 
 # fury is our registry for linux packages
 RUN echo "deb [trusted=yes] https://apt.fury.io/cli/ * *" > /etc/apt/sources.list.d/fury-cli.list
diff --git a/odiglet/debug.Dockerfile b/odiglet/debug.Dockerfile
index ebad84efa..556893202 100644
--- a/odiglet/debug.Dockerfile
+++ b/odiglet/debug.Dockerfile
@@ -14,7 +14,7 @@ ARG DOTNET_OTEL_VERSION=v0.7.0
 ADD https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/download/$DOTNET_OTEL_VERSION/opentelemetry-dotnet-instrumentation-linux-musl.zip .
 RUN unzip opentelemetry-dotnet-instrumentation-linux-musl.zip && rm opentelemetry-dotnet-instrumentation-linux-musl.zip
 
-FROM --platform=$BUILDPLATFORM keyval/odiglet-base:v1.4 as builder
+FROM --platform=$BUILDPLATFORM keyval/odiglet-base:v1.5 as builder
 WORKDIR /go/src/github.com/odigos-io/odigos
 # Copyy local modules required by the build
 COPY api/ api/