From af1b02b5edd69694cf9e4e6c181c2c3b8d617629 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sat, 22 Mar 2025 17:10:46 -0700 Subject: [PATCH] fix: use apt-get instead of nala in setup-cpp Ubuntu images --- dev/docker/ci/ubuntu-gcc.dockerfile | 6 ++---- dev/docker/ci/ubuntu-llvm.dockerfile | 6 ++---- dev/docker/ci/ubuntu-mingw.dockerfile | 6 ++---- dev/docker/ci/ubuntu.dockerfile | 7 ++----- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dev/docker/ci/ubuntu-gcc.dockerfile b/dev/docker/ci/ubuntu-gcc.dockerfile index 5aa7e923..01170a65 100644 --- a/dev/docker/ci/ubuntu-gcc.dockerfile +++ b/dev/docker/ci/ubuntu-gcc.dockerfile @@ -4,10 +4,8 @@ FROM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-gcc RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ --compiler gcc && \ # cleanup - nala autoremove -y && \ - nala autopurge -y && \ - apt-get clean && \ - nala clean --lists && \ + apt-get clean autoclean && \ + apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /tmp/* diff --git a/dev/docker/ci/ubuntu-llvm.dockerfile b/dev/docker/ci/ubuntu-llvm.dockerfile index 3cf1405a..f1ad2c70 100644 --- a/dev/docker/ci/ubuntu-llvm.dockerfile +++ b/dev/docker/ci/ubuntu-llvm.dockerfile @@ -4,10 +4,8 @@ FROM aminya/setup-cpp-ubuntu:latest AS setup-cpp-ubuntu-llvm RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ --compiler llvm && \ # cleanup - nala autoremove -y && \ - nala autopurge -y && \ - apt-get clean && \ - nala clean --lists && \ + apt-get clean autoclean && \ + apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /tmp/* diff --git a/dev/docker/ci/ubuntu-mingw.dockerfile b/dev/docker/ci/ubuntu-mingw.dockerfile index 222503fa..10dcdd46 100644 --- a/dev/docker/ci/ubuntu-mingw.dockerfile +++ b/dev/docker/ci/ubuntu-mingw.dockerfile @@ -5,10 +5,8 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ --compiler mingw \ --powershell true && \ # cleanup - nala autoremove -y && \ - nala autopurge -y && \ - apt-get clean && \ - nala clean --lists && \ + apt-get clean autoclean && \ + apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /tmp/* diff --git a/dev/docker/ci/ubuntu.dockerfile b/dev/docker/ci/ubuntu.dockerfile index bc6bd1b0..56bde1ed 100644 --- a/dev/docker/ci/ubuntu.dockerfile +++ b/dev/docker/ci/ubuntu.dockerfile @@ -23,7 +23,6 @@ COPY "./dist/modern" "/usr/lib/setup-cpp/" # install the cpp tools RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ - --nala true \ --cmake true \ --ninja true \ --task true \ @@ -38,10 +37,8 @@ RUN node --enable-source-maps /usr/lib/setup-cpp/setup-cpp.mjs \ --cmakelang true \ --meson true && \ # cleanup - nala autoremove -y && \ - nala autopurge -y && \ - apt-get clean && \ - nala clean --lists && \ + apt-get clean autoclean && \ + apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /tmp/*