From 8a446f322ebc092f07ac1a946e34fe1d1f95d16d Mon Sep 17 00:00:00 2001
From: Tim Fischer <fischeti@iis.ee.ethz.ch>
Date: Mon, 2 Sep 2024 11:11:45 +0200
Subject: [PATCH] container: Install verilator with apt

---
 util/container/Dockerfile | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/util/container/Dockerfile b/util/container/Dockerfile
index ab39f86c6..9cb8f1a64 100644
--- a/util/container/Dockerfile
+++ b/util/container/Dockerfile
@@ -5,7 +5,7 @@
 # Docker container for Snitch development.
 
 # 1. Stage
-FROM ubuntu:22.04 AS builder
+FROM ubuntu:24.04 AS builder
 ARG CMAKE_VERSION=3.19.4
 ARG PYTHON_VERSION=3.9.12
 ARG BENDER_VERSION=0.27.1
@@ -59,14 +59,8 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 RUN rustup install 1.70.0
 RUN rustup override set 1.70.0
 
-# Build Verilator
-RUN git clone https://github.com/verilator/verilator && \
-    cd verilator && \
-    git checkout "v${VERILATOR_VERSION}" && \
-    autoconf && \
-    ./configure --prefix /tools/verilator && \
-    make && \
-    make install
+# Install Verilator
+RUN apt-get install -y verilator=${VERILATOR_VERSION}
 
 # Change working directory
 WORKDIR /tools
@@ -93,7 +87,7 @@ RUN tar xzf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
 RUN mv doxygen-${DOXYGEN_VERSION} doxygen
 
 # 2. Stage
-FROM ubuntu:22.04 AS snitch_cluster
+FROM ubuntu:24.04 AS snitch_cluster
 ARG SNITCH_LLVM_VERSION=latest
 ARG VERIBLE_VERSION=0.0-3318-g8d254167