From 7388ec90c4663172da3009a08c489f2574a90091 Mon Sep 17 00:00:00 2001 From: Erki Date: Tue, 25 Jun 2024 16:04:22 +0300 Subject: [PATCH] Clear up ubuntu-cpp.Dockerfile --- cpp-ubuntu.Dockerfile | 8 -------- llvm.Dockerfile | 2 +- ubuntu-cpp.Dockerfile | 7 +++++++ 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 cpp-ubuntu.Dockerfile create mode 100644 ubuntu-cpp.Dockerfile diff --git a/cpp-ubuntu.Dockerfile b/cpp-ubuntu.Dockerfile deleted file mode 100644 index bc5d0db..0000000 --- a/cpp-ubuntu.Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM ubuntu:20.04 - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update -y && apt-get install -y --no-install-recommends git build-essential cmake ninja-build python3 python3-pip -RUN pip3 install --upgrade conan==1.42.1 -RUN conan profile new default --detect -RUN conan profile update settings.compiler.libcxx=libstdc++11 default diff --git a/llvm.Dockerfile b/llvm.Dockerfile index e2ce32b..574cadf 100644 --- a/llvm.Dockerfile +++ b/llvm.Dockerfile @@ -1,4 +1,4 @@ -FROM erki/cpp-ubuntu:latest +FROM erki/ubuntu-cpp:latest ENV DEBIAN_FRONTEND noninteractive diff --git a/ubuntu-cpp.Dockerfile b/ubuntu-cpp.Dockerfile new file mode 100644 index 0000000..6df914c --- /dev/null +++ b/ubuntu-cpp.Dockerfile @@ -0,0 +1,7 @@ +FROM ubuntu:24.04 + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update -y && apt-get install -y --no-install-recommends git build-essential cmake ninja-build python3 pipx python3-sphinx +RUN pipx ensurepath +RUN pipx install breathe