Skip to content

Commit

Permalink
Merge pull request #5 from romange/Pr1
Browse files Browse the repository at this point in the history
add 23.10 to container build
  • Loading branch information
romange authored Nov 28, 2023
2 parents 55a4975 + 908a816 commit 306d8fe
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
file: u20.04-dev.Dockerfile
- container: "ubuntu-dev:22"
file: u22.04-dev.Dockerfile
- container: "ubuntu-dev:23.10"
file: "u23.10-dev.Dockerfile"
- container: "fedora:30"
file: "fedora30-dev.Dockerfile"
steps:
Expand Down
2 changes: 1 addition & 1 deletion get_mold.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e

cd /tmp
ARCH=`uname -m`
MOLD_VER=1.2.1
MOLD_VER=2.3.3
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
Expand Down
18 changes: 18 additions & 0 deletions u23.10-dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM ubuntu:23.10

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 \
gcc-11 g++-11 libboost-fiber-dev libxml2-dev zip ccache \
debhelper moreutils pip jq lsof lcov \
&& rm -rf /var/lib/apt/lists/*

RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 40 \
--slave /usr/bin/g++ g++ /usr/bin/g++-11

RUN /tmp/get_mold.sh

0 comments on commit 306d8fe

Please sign in to comment.