From d657d38fd243fb5abd309c576c424ff5d12b25b5 Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Tue, 8 Jul 2025 18:11:31 +0200 Subject: [PATCH] Use wget instead of curl --- tools/docker/Dockerfile.test_spack | 5 ++--- tools/docker/generate_dockerfiles.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/docker/Dockerfile.test_spack b/tools/docker/Dockerfile.test_spack index 98892afd9f..7b82909cb5 100644 --- a/tools/docker/Dockerfile.test_spack +++ b/tools/docker/Dockerfile.test_spack @@ -10,7 +10,6 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ bzip2 \ ca-certificates \ cmake \ - curl \ g++ \ gcc \ gfortran \ @@ -53,10 +52,10 @@ ENV SPACK_ROOT=/opt/spack-$SPACK_VERSION ARG SPACK_PACKAGES_REPO=https://github.com/spack/spack-packages ENV SPACK_PACKAGES_ROOT=/opt/spack-packages-$SPACK_PACKAGES_VERSION RUN mkdir -p $SPACK_ROOT \ - && curl -OL $SPACK_REPO/archive/$SPACK_VERSION.tar.gz \ + && wget -q $SPACK_REPO/archive/$SPACK_VERSION.tar.gz \ && tar -xzf $SPACK_VERSION.tar.gz -C /opt && rm -f $SPACK_VERSION.tar.gz \ && mkdir -p $SPACK_PACKAGES_ROOT \ - && curl -OL $SPACK_PACKAGES_REPO/archive/$SPACK_PACKAGES_VERSION.tar.gz \ + && wget -q $SPACK_PACKAGES_REPO/archive/$SPACK_PACKAGES_VERSION.tar.gz \ && tar -xzf $SPACK_PACKAGES_VERSION.tar.gz -C /opt && rm -f $SPACK_PACKAGES_VERSION.tar.gz ENV PATH="$SPACK_ROOT/bin:${PATH}" diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index 9a0006e274..127fe2b13f 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -855,7 +855,6 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ bzip2 \ ca-certificates \ cmake \ - curl \ g++ \ gcc \ gfortran \ @@ -898,10 +897,10 @@ ENV SPACK_ROOT=/opt/spack-$SPACK_VERSION ARG SPACK_PACKAGES_REPO=https://github.com/spack/spack-packages ENV SPACK_PACKAGES_ROOT=/opt/spack-packages-$SPACK_PACKAGES_VERSION RUN mkdir -p $SPACK_ROOT \ - && curl -OL $SPACK_REPO/archive/$SPACK_VERSION.tar.gz \ + && wget -q $SPACK_REPO/archive/$SPACK_VERSION.tar.gz \ && tar -xzf $SPACK_VERSION.tar.gz -C /opt && rm -f $SPACK_VERSION.tar.gz \ && mkdir -p $SPACK_PACKAGES_ROOT \ - && curl -OL $SPACK_PACKAGES_REPO/archive/$SPACK_PACKAGES_VERSION.tar.gz \ + && wget -q $SPACK_PACKAGES_REPO/archive/$SPACK_PACKAGES_VERSION.tar.gz \ && tar -xzf $SPACK_PACKAGES_VERSION.tar.gz -C /opt && rm -f $SPACK_PACKAGES_VERSION.tar.gz ENV PATH="$SPACK_ROOT/bin:${{PATH}}"