sonarcloud refactor

bringauto · Sep 25, 2024 · 496a3ca · 496a3ca
1 parent 72c95cc
commit 496a3ca
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 31 deletions.
diff --git a/example/docker/debian12/Dockerfile b/example/docker/debian12/Dockerfile
@@ -5,7 +5,7 @@ RUN echo root:1234 | chpasswd
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      build-essential binutils lsb-release make git libssl-dev openssh-server wget patchelf software-properties-common flex && \
+      binutils build-essential flex git libssl-dev lsb-release make openssh-server patchelf software-properties-common && \
     rm -rf /var/lib/apt/lists/*
 
 RUN git clone --depth=1 --single-branch --branch=releases/gcc-13.2.0 git://gcc.gnu.org/git/gcc.git /gcc && \
@@ -18,16 +18,11 @@ RUN cd /gcc/objdir && \
     make -j$(nproc) && \
     make install
 
-RUN wget "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-linux-x86_64.sh" -O cmake.sh && \
-    chmod +x cmake.sh && \
+ADD "https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-linux-x86_64.sh" cmake.sh
+RUN chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh
 
-RUN apt-get update && \
-    apt-get purge -y \
-      wget && \
-      rm -rf /var/lib/apt/lists/*
-
 RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib
 RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc && \
     echo "export CC=/usr/local/bin/gcc" >> /root/.bashrc && \

diff --git a/example/docker/fedora40/Dockerfile b/example/docker/fedora40/Dockerfile
@@ -5,17 +5,13 @@ RUN echo root:1234 | chpasswd
 
 RUN dnf -y update && \
     dnf -y install  \
-      make automake gcc gcc-c++ kernel-devel binutils lsb-release git openssl-devel openssh-server wget patchelf
-
-RUN wget "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" -O cmake.sh && \
-    chmod +x cmake.sh && \
+    automake binutils gcc gcc-c++ git kernel-devel lsb-release make openssh-server openssl-devel patchelf 
+    
+ADD "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" cmake.sh
+RUN chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh
 
-RUN dnf -y update && \
-    dnf -y remove \
-      wget
-
 RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib
 RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc
 

diff --git a/example/docker/fleet-os-2/Dockerfile b/example/docker/fleet-os-2/Dockerfile
@@ -8,11 +8,11 @@ RUN echo root:1234 | chpasswd
 #
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      build-essential xz-utils sed git libssl-dev openssh-server wget unzip python3 make patchelf && \
+      build-essential xz-utils sed git libssl-dev openssh-server unzip python3 make patchelf && \
     rm -rf /var/lib/apt/lists/*
 
-RUN wget "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh" -O cmake.sh && \
-    chmod +x cmake.sh && \
+ADD "https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.sh" cmake.sh
+RUN chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh
 
@@ -33,7 +33,7 @@ COPY uname.txt /root/tools/
 
 RUN apt-get update && \
     apt-get purge -y \
-      wget unzip && \
+      unzip && \
       rm -rf /var/lib/apt/lists/*
 
 ENTRYPOINT ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
diff --git a/example/docker/ubuntu1804-aarch64/Dockerfile b/example/docker/ubuntu1804-aarch64/Dockerfile
@@ -5,13 +5,13 @@ RUN echo root:1234 | chpasswd
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      build-essential make libssl-dev coreutils lsb-release wget g++-8 gcc-8 gcc-8-aarch64-linux-gnu g++-8-aarch64-linux-gnu patchelf unzip openssh-server git && \
+    build-essential coreutils g++-8 g++-8-aarch64-linux-gnu gcc-8 gcc-8-aarch64-linux-gnu git libssl-dev lsb-release make openssh-server patchelf unzip && \
     rm -rf /var/lib/apt/lists/*
 
 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-8
 
-RUN wget "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" -O cmake.sh && \
-    chmod +x cmake.sh && \
+ADD "https://github.com/Kitware/CMake/releases/download/v3.28.0/cmake-3.28.0-linux-x86_64.sh" cmake.sh
+RUN chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh
 

diff --git a/example/docker/ubuntu2404/Dockerfile b/example/docker/ubuntu2404/Dockerfile
@@ -5,18 +5,20 @@ RUN echo root:1234 | chpasswd
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      	coreutils lsb-release build-essential  openssh-server git libssl-dev wget patchelf && \
+      	build-essential \
+        coreutils \
+        git \
+        libssl-dev \
+        lsb-release \
+        openssh-server \
+        patchelf && \
     rm -rf /var/lib/apt/lists/*
 
-RUN wget "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" -O cmake.sh && \
-    chmod +x cmake.sh && \
+ADD "https://github.com/Kitware/CMake/releases/download/v3.30.3/cmake-3.30.3-linux-x86_64.sh" cmake.sh
+RUN chmod +x cmake.sh && \
     ./cmake.sh --skip-license --prefix=/usr/local && \
     rm ./cmake.sh 
-
-RUN apt-get purge -y \
-    wget && \
-    rm -rf /var/lib/apt/lists/*
-
+
 RUN git clone https://github.com/cmakelib/cmakelib.git /cmakelib
 RUN echo "export CMLIB_DIR=/cmakelib" >> /root/.bashrc