Skip to content

Commit

Permalink
Merge pull request #10 from EnzymeAD/ubuntu-24
Browse files Browse the repository at this point in the history
add ubuntu 24
  • Loading branch information
tgymnich authored Aug 22, 2024
2 parents 07b30ff + 63f11a3 commit 55547a5
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ jobs:
llvm: 11
- ubuntu: 22
llvm: 12
- ubuntu: 24
llvm: 11
- ubuntu: 24
llvm: 12
- ubuntu: 24
llvm: 13
- ubuntu: 24
llvm: 14
- ubuntu: 24
llvm: 15
- ubuntu: 24
llvm: 16
permissions:
packages: write
contents: read
Expand Down
12 changes: 9 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ ARG LLVM_VERSION=12
FROM ubuntu:$UBUNTU_VERSION

ARG LLVM_VERSION
ARG UBUNTU_VERSION

ARG USERNAME=vscode
ARG USER_UID=1000
ARG USER_UID=1001
ARG USER_GID=$USER_UID

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get -q update \
&& apt-get install -y --no-install-recommends ca-certificates software-properties-common curl gnupg2 \
&& curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - \
&& apt-add-repository "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-$LLVM_VERSION main" \
&& apt-add-repository -y "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-$LLVM_VERSION main" \
&& apt-get -q update \
&& 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 \
&& python3 -m pip install --upgrade pip lit pathlib2 \
&& groupadd --gid $USER_GID $USERNAME \
&& useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
Expand All @@ -26,6 +26,12 @@ RUN apt-get -q update \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

RUN if [ "$UBUNTU_VERSION" = "24.04" ] ; then \
python3 -m pip install --break-system-packages lit pathlib2; \
else \
python3 -m pip install lit pathlib2; \
fi

RUN SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhistory/.bash_history" \
&& mkdir /commandhistory \
&& touch /commandhistory/.bash_history \
Expand Down

0 comments on commit 55547a5

Please sign in to comment.