Skip to content

Commit 55547a5

Browse files
authored
Merge pull request #10 from EnzymeAD/ubuntu-24
add ubuntu 24
2 parents 07b30ff + 63f11a3 commit 55547a5

2 files changed

Lines changed: 21 additions & 3 deletions

File tree

.github/workflows/docker-publish.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ jobs:
1919
llvm: 11
2020
- ubuntu: 22
2121
llvm: 12
22+
- ubuntu: 24
23+
llvm: 11
24+
- ubuntu: 24
25+
llvm: 12
26+
- ubuntu: 24
27+
llvm: 13
28+
- ubuntu: 24
29+
llvm: 14
30+
- ubuntu: 24
31+
llvm: 15
32+
- ubuntu: 24
33+
llvm: 16
2234
permissions:
2335
packages: write
2436
contents: read

Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ ARG LLVM_VERSION=12
44
FROM ubuntu:$UBUNTU_VERSION
55

66
ARG LLVM_VERSION
7+
ARG UBUNTU_VERSION
78

89
ARG USERNAME=vscode
9-
ARG USER_UID=1000
10+
ARG USER_UID=1001
1011
ARG USER_GID=$USER_UID
1112

1213
ENV DEBIAN_FRONTEND=noninteractive
1314

1415
RUN apt-get -q update \
1516
&& apt-get install -y --no-install-recommends ca-certificates software-properties-common curl gnupg2 \
1617
&& curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - \
17-
&& apt-add-repository "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-$LLVM_VERSION main" \
18+
&& apt-add-repository -y "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-$LLVM_VERSION main" \
1819
&& apt-get -q update \
1920
&& apt-get install -y --no-install-recommends sudo git ssh zlib1g-dev libzstd-dev automake autoconf cmake make lldb ninja-build gcc g++ gfortran build-essential libtool llvm-$LLVM_VERSION-dev clang-format clangd clang-$LLVM_VERSION libclang-$LLVM_VERSION-dev libomp-$LLVM_VERSION-dev libblas-dev libeigen3-dev libboost-dev python3 python3-pip \
20-
&& python3 -m pip install --upgrade pip lit pathlib2 \
2121
&& groupadd --gid $USER_GID $USERNAME \
2222
&& useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
2323
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
@@ -26,6 +26,12 @@ RUN apt-get -q update \
2626
&& apt-get clean -y \
2727
&& rm -rf /var/lib/apt/lists/*
2828

29+
RUN if [ "$UBUNTU_VERSION" = "24.04" ] ; then \
30+
python3 -m pip install --break-system-packages lit pathlib2; \
31+
else \
32+
python3 -m pip install lit pathlib2; \
33+
fi
34+
2935
RUN SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhistory/.bash_history" \
3036
&& mkdir /commandhistory \
3137
&& touch /commandhistory/.bash_history \

0 commit comments

Comments
 (0)