Merge branch 'main' of github.com:SpareCores/sc-images

images/benchmark-passmark/Dockerfile

@@ -5,21 +5,21 @@ RUN --mount=type=tmpfs,target=/tmp,rw \
     apt-get update --error-on=any && \
     apt-get install -y curl unzip sudo dmidecode
 
+# Use local files, as they might be deleted from the mirrors
+COPY pkgs/libtinfo5_6.4-2_amd64.deb pkgs/libncurses5_6.4-2_amd64.deb /tmp/amd64/
+COPY pkgs/libtinfo5_6.2-0ubuntu2.1_arm64.deb pkgs/libncurses5_6.2-0ubuntu2.1_arm64.deb /tmp/arm64/
+
 ARG INTEL_URL="https://www.passmark.com/downloads/pt_linux_x64.zip"
 ARG ARM64_URL="https://www.passmark.com/downloads/pt_linux_arm64.zip"
-ARG LIBTINFO_INTEL="http://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libtinfo5_6.4-2_amd64.deb"
-ARG LIBNCURSES_INTEL="http://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libncurses5_6.4-2_amd64.deb"
-ARG LIBTINFO_ARM="http://ports.ubuntu.com/pool/universe/n/ncurses/libtinfo5_6.2-0ubuntu2.1_arm64.deb"
-ARG LIBNCURSES_ARM="http://ports.ubuntu.com/pool/universe/n/ncurses/libncurses5_6.2-0ubuntu2.1_arm64.deb"
 
 RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
         DOWNLOAD_URL=$ARM64_URL && \
-        LIBTINFO_URL=$LIBTINFO_ARM && \
-        LIBNCURSES_URL=$LIBNCURSES_ARM; \
+        LIBTINFO_DEB="/tmp/arm64/libtinfo5_6.2-0ubuntu2.1_arm64.deb" && \
+        LIBNCURSES_DEB="/tmp/arm64/libncurses5_6.2-0ubuntu2.1_arm64.deb"; \
     else \
         DOWNLOAD_URL=$INTEL_URL && \
-        LIBTINFO_URL=$LIBTINFO_INTEL && \
-        LIBNCURSES_URL=$LIBNCURSES_INTEL; \
+        LIBTINFO_DEB="/tmp/amd64/libtinfo5_6.4-2_amd64.deb" && \
+        LIBNCURSES_DEB="/tmp/amd64/libncurses5_6.4-2_amd64.deb"; \
     fi && \
     curl -L "$DOWNLOAD_URL" -o pt_linux.zip && \
     unzip pt_linux.zip -d /usr/local && \
@@ -29,11 +29,9 @@ RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
     else \
         mv /usr/local/PerformanceTest/pt_linux_x64 /usr/local/bin/pt_linux; \
     fi && \
-    # Download and install ncurses5 libraries
-    curl -L "$LIBTINFO_URL" -o libtinfo5.deb && \
-    curl -L "$LIBNCURSES_URL" -o libncurses5.deb && \
-    dpkg -i libtinfo5.deb libncurses5.deb && \
-    rm libtinfo5.deb libncurses5.deb
+    # Install local ncurses5 libraries
+    dpkg -i "$LIBTINFO_DEB" "$LIBNCURSES_DEB" && \
+    rm "$LIBTINFO_DEB" "$LIBNCURSES_DEB"
 
 RUN chmod +x /usr/local/bin/pt_linux