fix: Dockerfile (#4786)

ChainSafe · Sep 23, 2024 · 837d944 · 837d944
1 parent 0ed128a
commit 837d944
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,9 @@
 
 ### Changed
 
+- [#4786](https://github.com/ChainSafe/forest/issues/4786) ubuntu image is
+  upgraded from 22.04 to 24.04 in Dockerfile
+
 ### Removed
 
 ### Fixed

diff --git a/Dockerfile b/Dockerfile
@@ -7,13 +7,14 @@
 # ```
 # 
 
-FROM golang:1.22-bullseye AS build-env
+FROM golang:1.22-bookworm AS build-env
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # install dependencies
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y build-essential clang curl git ca-certificates
+    apt-get install --no-install-recommends -y build-essential clang-14 curl git ca-certificates
 RUN update-ca-certificates
+ENV CC=clang-14 CXX=clang++-14
 
 # install Rust
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --profile minimal
@@ -36,7 +37,7 @@ RUN --mount=type=cache,sharing=private,target=/root/.cargo/registry \
 # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md#cached-docker-images
 ##
 # A slim image contains only forest binaries
-FROM ubuntu:22.04 AS slim-image
+FROM ubuntu:24.04 AS slim-image
 
 ENV DEBIAN_FRONTEND="noninteractive"
 # Install binary dependencies

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
diff --git a/f3-sidecar/Dockerfile b/f3-sidecar/Dockerfile