Skip to content

Commit af1b02b

Browse files
committed
fix: use apt-get instead of nala in setup-cpp Ubuntu images
1 parent a96be2f commit af1b02b

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

dev/docker/ci/ubuntu-gcc.dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ FROM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-gcc
44
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
55
--compiler gcc && \
66
# cleanup
7-
nala autoremove -y && \
8-
nala autopurge -y && \
9-
apt-get clean && \
10-
nala clean --lists && \
7+
apt-get clean autoclean && \
8+
apt-get autoremove -y && \
119
rm -rf /var/lib/apt/lists/* && \
1210
rm -rf /tmp/*
1311

dev/docker/ci/ubuntu-llvm.dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ FROM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-llvm
44
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
55
--compiler llvm && \
66
# cleanup
7-
nala autoremove -y && \
8-
nala autopurge -y && \
9-
apt-get clean && \
10-
nala clean --lists && \
7+
apt-get clean autoclean && \
8+
apt-get autoremove -y && \
119
rm -rf /var/lib/apt/lists/* && \
1210
rm -rf /tmp/*
1311

dev/docker/ci/ubuntu-mingw.dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
55
--compiler mingw \
66
--powershell true && \
77
# cleanup
8-
nala autoremove -y && \
9-
nala autopurge -y && \
10-
apt-get clean && \
11-
nala clean --lists && \
8+
apt-get clean autoclean && \
9+
apt-get autoremove -y && \
1210
rm -rf /var/lib/apt/lists/* && \
1311
rm -rf /tmp/*
1412

dev/docker/ci/ubuntu.dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ COPY "./dist/modern" "/usr/lib/setup-cpp/"
2323

2424
# install the cpp tools
2525
RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
26-
--nala true \
2726
--cmake true \
2827
--ninja true \
2928
--task true \
@@ -38,10 +37,8 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \
3837
--cmakelang true \
3938
--meson true && \
4039
# cleanup
41-
nala autoremove -y && \
42-
nala autopurge -y && \
43-
apt-get clean && \
44-
nala clean --lists && \
40+
apt-get clean autoclean && \
41+
apt-get autoremove -y && \
4542
rm -rf /var/lib/apt/lists/* && \
4643
rm -rf /tmp/*
4744

0 commit comments

Comments
 (0)