Skip to content

Commit c2a161a

Browse files
update dockerfiles
1 parent 51c1f84 commit c2a161a

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

.github/ciimage/Dockerfile.archlinux

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ RUN pacman -Syu --noconfirm && \
1111
clang \
1212
gdb \
1313
llvm \
14-
rust \
15-
cargo \
14+
cmake \
1615
wget \
1716
python \
1817
python-pip \

.github/ciimage/Dockerfile.debian

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ RUN apt-get update && \
1515
gdb \
1616
llvm \
1717
libstdc++-8-dev \
18-
rustc \
19-
cargo \
18+
cmake \
2019
wget \
2120
python3 \
2221
python3-pip \
@@ -36,4 +35,4 @@ ENV LD_LIBRARY_PATH=/usr/local/lib
3635
WORKDIR /workspace
3736

3837
# Default command
39-
CMD ["bash"]
38+
CMD ["bash"]

.github/ciimage/Dockerfile.fedora

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ENV TZ=UTC
66

77
# Install system dependencies and clean up
88
RUN dnf -y update && \
9+
dnf -y groupinstall "Development Tools" && \
910
dnf install -y \
1011
gcc \
1112
gcc-c++ \
@@ -19,9 +20,8 @@ RUN dnf -y update && \
1920
python3-pip \
2021
git && \
2122
dnf clean all
22-
2323
# Install Meson and Ninja using pip
24-
RUN python3 -m pip install --no-cache-dir meson ninja
24+
RUN python3 -m pip install --no-cache-dir cmake meson ninja
2525

2626
# Set environment variables
2727
ENV CC=/usr/bin/clang

.github/ciimage/Dockerfile.ubuntu

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,20 @@ RUN apt-get update && \
1414
g++ \
1515
gdb \
1616
llvm \
17-
gobjc \
18-
gobjc++ \
19-
libobjc-10-dev \
2017
libstdc++-10-dev \
2118
rustc \
2219
cargo \
23-
dub \
2420
wget \
2521
python3 \
2622
python3-pip \
27-
git && \
23+
git \
24+
tzdata && \
2825
apt-get clean && \
2926
rm -rf /var/lib/apt/lists/*
3027

31-
# Install Meson, Ninja, and Cython using pip
32-
RUN python3 -m pip install --no-cache-dir meson ninja
28+
RUN python3 -m pip install --no-cache-dir cmake meson ninja
3329

3430
# Set environment variables
3531
ENV CC=/usr/bin/gcc
3632
ENV CXX=/usr/bin/g++
37-
ENV LD_LIBRARY_PATH=/usr/local/lib
33+
ENV LD_LIBRARY_PATH=/usr/local/lib

0 commit comments

Comments
 (0)