Skip to content

Commit

Permalink
Update dockerfiles with Ubuntu 24.10 and Clang 18 and 19. Remove obso…
Browse files Browse the repository at this point in the history
…lete ones.
  • Loading branch information
poletti-marco committed Feb 1, 2025
1 parent f47f76e commit a023f59
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 73 deletions.
38 changes: 0 additions & 38 deletions extras/dockerfiles/Dockerfile.ubuntu-22.10

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
FROM ubuntu:23.10
FROM ubuntu:24.10
MAINTAINER Marco Poletti <[email protected]>

COPY common_install.sh common_cleanup.sh /

RUN bash -x /common_install.sh

COPY ubuntu-23.10_custom.list /etc/apt/sources.list.d/
COPY ubuntu-24.10_custom.list /etc/apt/sources.list.d/

RUN apt-get update

RUN apt-get install -y --allow-unauthenticated --no-install-recommends \
g++-9 \
g++-10 \
g++-11 \
g++-12 \
g++-13 \
clang-13 \
g++-14 \
clang-14 \
clang-15 \
clang-16 \
clang-17 \
clang-18 \
clang-19 \
python3 \
python3-absl \
python3-bidict \
python3-distutils \
python3-networkx \
python3-pytest \
python3-pytest-xdist \
Expand Down
2 changes: 1 addition & 1 deletion extras/dockerfiles/rebuild_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ docker run --rm --privileged multiarch/qemu-user-static:register --reset

COMMANDS=()

for V in 20.04 22.04 22.10 23.10 24.04
for V in 20.04 22.04 24.04 24.10
do
C="docker build --squash -t polettimarco/fruit-basesystem:ubuntu-$V -f Dockerfile.ubuntu-$V ."
COMMANDS+=("$C || { echo; echo FAILED: '$C'; echo; exit 1; }")
Expand Down
8 changes: 4 additions & 4 deletions extras/dockerfiles/ubuntu-20.04_custom.list
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main
deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main
deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main
deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main
deb http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main
deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-18 main
deb http://apt.llvm.org/focal/ llvm-toolchain-focal-19 main
deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-19 main
8 changes: 4 additions & 4 deletions extras/dockerfiles/ubuntu-22.04_custom.list
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main
deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main
deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main
deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
4 changes: 0 additions & 4 deletions extras/dockerfiles/ubuntu-22.10_custom.list

This file was deleted.

4 changes: 0 additions & 4 deletions extras/dockerfiles/ubuntu-23.10_custom.list

This file was deleted.

4 changes: 2 additions & 2 deletions extras/dockerfiles/ubuntu-24.04_custom.list
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deb http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main
deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-17 main
deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main
deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main
deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main
deb-src http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main
4 changes: 4 additions & 0 deletions extras/dockerfiles/ubuntu-24.10_custom.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
deb http://apt.llvm.org/oracular/ llvm-toolchain-oracular-18 main
deb-src http://apt.llvm.org/oracular/ llvm-toolchain-oracular-18 main
deb http://apt.llvm.org/oracular/ llvm-toolchain-oracular-19 main
deb-src http://apt.llvm.org/oracular/ llvm-toolchain-oracular-19 main
10 changes: 0 additions & 10 deletions extras/dockerfiles/ubuntu_arm-16.04_custom.list

This file was deleted.

0 comments on commit a023f59

Please sign in to comment.