chore: add ubuntu 24.04 image to the foundry

Signed-off-by: Roman Gershman <[email protected]>
romange · Mar 1, 2024 · d06f7e0 · d06f7e0
1 parent 91150fb
commit d06f7e0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -5,7 +5,7 @@ on:
     branches: [ main ]
   workflow_dispatch:
 
-permissions: 
+permissions:
   packages: write
 
 jobs:
@@ -25,21 +25,24 @@ jobs:
           - container: "ubuntu-dev:22"
             file: u22.04-dev.Dockerfile
           - container: "ubuntu-dev:23.10"
-            file: "u23.10-dev.Dockerfile"
+            file: u23.10-dev.Dockerfile
           - container: "fedora:30"
-            file: "fedora30-dev.Dockerfile"
+            file: fedora30-dev.Dockerfile
           - container: "centos-dev:7"
-            file: "centos7-dev.Dockerfile"
+            file: centos7-dev.Dockerfile
+          - container: "ubuntu-dev:24"
+            file: u24.04-dev.Dockerfile
+
     steps:
     - name: checkout
       uses: actions/checkout@v3
 
     # https://github.com/docker/setup-qemu-action
-    - 
+    -
       name: Set up QEMU
       id: qemu
       uses: docker/setup-qemu-action@v2
-      with:          
+      with:
           platforms: arm64,amd64
     -
       name: Available platforms
@@ -55,8 +58,8 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - 
-      name: Build 
+    -
+      name: Build
       uses: docker/build-push-action@v4
       with:
         context: .

diff --git a/get_mold.sh b/get_mold.sh
@@ -3,7 +3,7 @@ set -e
 
 cd /tmp 
 ARCH=`uname -m`
-MOLD_VER=2.3.3
+MOLD_VER=2.4.1
 BASE_URL=https://github.com/rui314/mold/releases/download
 curl -L -s $BASE_URL/v${MOLD_VER}/mold-$MOLD_VER-$ARCH-linux.tar.gz -o mold.tgz
 mkdir mold 

diff --git a/u22.04-dev.Dockerfile b/u22.04-dev.Dockerfile
@@ -8,7 +8,7 @@ COPY ./get_mold.sh /tmp/
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update && apt install -y autoconf-archive bison cmake curl gdb git libssl-dev \
     libunwind-dev libfl-dev ninja-build libtool \
-    gcc-11 g++-11 libboost-fiber-dev libxml2-dev zip ccache libzstd-dev \
+    gcc-11 g++-11 libboost-context-dev libxml2-dev zip ccache libzstd-dev \
     debhelper moreutils pip jq lsof lcov libflatbuffers-dev \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/u24.04-dev.Dockerfile b/u24.04-dev.Dockerfile
@@ -0,0 +1,15 @@
+FROM ubuntu:24.04
+
+LABEL org.opencontainers.image.source https://github.com/romange/container-foundry
+
+COPY ./get_mold.sh /tmp/
+
+# To avoid tzdata reconfigure
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt update && apt install -y autoconf-archive bison cmake curl gdb git libssl-dev \
+    libunwind-dev libfl-dev ninja-build libtool \
+    libboost-context-dev libxml2-dev zip ccache \
+    debhelper moreutils pip jq lsof lcov libflatbuffers-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN /tmp/get_mold.sh