From 292f698d5bf8c00625f5d6d0224e826152ca70cb Mon Sep 17 00:00:00 2001
From: yorickdowne <71337066+yorickdowne@users.noreply.github.com>
Date: Sat, 10 Aug 2024 20:09:19 -0400
Subject: [PATCH] Build Teku and Besu on Noble Numbat (#1901)

---
 besu/Dockerfile.source | 5 +++--
 default.env            | 2 +-
 teku/Dockerfile.source | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/besu/Dockerfile.source b/besu/Dockerfile.source
index 054236d3..34f0768f 100644
--- a/besu/Dockerfile.source
+++ b/besu/Dockerfile.source
@@ -1,5 +1,5 @@
 # Build Besu in a stock Ubuntu container
-FROM eclipse-temurin:21-jdk-jammy AS builder
+FROM eclipse-temurin:21-jdk-noble AS builder
 
 # This is here to avoid build-time complaints
 ARG DOCKER_TAG
@@ -14,7 +14,7 @@ WORKDIR /usr/src
 RUN bash -c "git clone --recurse-submodules -j8 ${SRC_REPO} besu && cd besu && git config advice.detachedHead false && git fetch --all --tags && if [[ ${BUILD_TARGET} =~ pr-.+ ]]; then git fetch origin pull/$(echo ${BUILD_TARGET} | cut -d '-' -f 2)/head:besu-pr; git checkout besu-pr; else git checkout ${BUILD_TARGET}; fi && ./gradlew installDist"
 
 # Pull all binaries into a second stage deploy Ubuntu container
-FROM eclipse-temurin:21-jre-jammy
+FROM eclipse-temurin:21-jre-noble
 
 ARG USER=besu
 ARG UID=10001
@@ -28,6 +28,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
   libjemalloc-dev \
   git \
   wget \
+  adduser \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/default.env b/default.env
index d1653952..58c9ce8f 100644
--- a/default.env
+++ b/default.env
@@ -301,7 +301,7 @@ DEPCLI_SRC_REPO=https://github.com/ethereum/staking-deposit-cli
 DEPCLI_DOCKER_TAG=nonesuch
 
 # traefik and ddns-updater
-TRAEFIK_TAG=v3.0
+TRAEFIK_TAG=v3.1
 DDNS_TAG=v2
 
 # For the Node Dashboard, define a regex of mount points to ignore for the diskspace check.
diff --git a/teku/Dockerfile.source b/teku/Dockerfile.source
index 073105b3..23de739e 100644
--- a/teku/Dockerfile.source
+++ b/teku/Dockerfile.source
@@ -1,5 +1,5 @@
 # Build Teku in a stock Ubuntu container
-FROM eclipse-temurin:21-jdk-jammy AS builder
+FROM eclipse-temurin:21-jdk-noble AS builder
 
 # This is here to avoid build-time complaints
 ARG DOCKER_TAG
@@ -21,7 +21,7 @@ RUN bash -c "git clone ${SRC_REPO} teku \
   && ./gradlew installDist"
 
 # Pull all binaries into a second stage deploy Ubuntu container
-FROM eclipse-temurin:21-jre-jammy
+FROM eclipse-temurin:21-jre-noble
 
 ARG USER=teku
 ARG UID=10002
@@ -30,6 +30,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
   ca-certificates \
   tzdata \
   git \
+  adduser \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*