From e7bafbeff84eec84425ed6736fa8e60a564b4e2d Mon Sep 17 00:00:00 2001
From: Ben Sampson <bensampson5@gmail.com>
Date: Sat, 25 May 2024 17:01:10 -0700
Subject: [PATCH] update dockerfile to jammy, fix bazel, verilator, and verible
 install

---
 Dockerfile | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ca7f3a8..fd37ed3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:jammy
 
 WORKDIR /tmp
 
@@ -6,6 +6,7 @@ WORKDIR /tmp
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
+        apt-transport-https \
         autoconf \
         bc \
         bison \
@@ -16,6 +17,7 @@ RUN apt-get update \
         g++ \
         git \
         gnupg \
+        help2man \
         libfl2 \
         libfl-dev \
         libgoogle-perftools-dev \
@@ -26,21 +28,20 @@ RUN apt-get update \
         python3-dev \
         python3-pip \
         wget \
-        zlibc \
         zlib1g \
         zlib1g-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 # Add Bazel distribution URI as a package source
-RUN curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg \
-    && mv bazel.gpg /etc/apt/trusted.gpg.d/ \
-    && echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
+RUN curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >bazel-archive-keyring.gpg \
+    && mv bazel-archive-keyring.gpg /usr/share/keyrings \
+    && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
 
 # Install Bazel
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
-    bazel \
+        bazel \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -50,9 +51,9 @@ COPY poetry.lock pyproject.toml ./
 RUN poetry config virtualenvs.create false
 RUN poetry install -n --no-ansi
 
-# Build and install Verilator v4.106 from source
+# Build and install Verilator v5.024 from source
 ARG REPO=https://github.com/verilator/verilator
-ARG TAG=v4.106
+ARG TAG=v5.024
 RUN git clone --depth 1 --branch "${TAG}" "${REPO}" verilator \
     && cd verilator \
     && autoconf \
@@ -63,7 +64,7 @@ RUN git clone --depth 1 --branch "${TAG}" "${REPO}" verilator \
     && rm -rf verilator
 
 # Install Verible
-ARG VERIBLE_URL=https://github.com/chipsalliance/verible/releases/download/v0.0-1854-g0834c7f8/verible-v0.0-1854-g0834c7f8-Ubuntu-20.04-focal-x86_64.tar.gz
+ARG VERIBLE_URL=https://github.com/chipsalliance/verible/releases/download/v0.0-3648-g5ef1624a/verible-v0.0-3648-g5ef1624a-linux-static-arm64.tar.gz
 RUN wget ${VERIBLE_URL} -O verible.tar.gz \
     && mkdir verible \
     && tar -xf verible.tar.gz -C verible --strip-components=1 \