Fix DL4001: Either use Wget or Curl but not both

Author: hugovk

.hadolint.yaml

@@ -9,5 +9,4 @@ ignored:
   - DL3041 # Pin versions in dnf install
   - DL3047 # Avoid use of wget without progress bar
   - DL3059 # Multiple consecutive RUN instructions
-  - DL4001 # Either use Wget or Curl but not both
   - SC2016 # Expressions don't expand in single quotes

amazon-2-amd64/Dockerfile

@@ -23,7 +23,6 @@ RUN yum install -y \
     tk-devel \
     unzip \
     util-linux \
-    wget \
     which \
     xorg-x11-server-Xvfb \
     xorg-x11-xauth \
@@ -44,7 +43,7 @@ RUN yum remove -y openssl-devel && \
     yum install -y openssl11-devel && \
     yum clean all
 
-RUN wget https://www.python.org/ftp/python/3.10.18/Python-3.10.18.tgz \
+RUN curl -fsSLO https://www.python.org/ftp/python/3.10.18/Python-3.10.18.tgz \
     && tar xzf Python-3.10.18.tgz \
     && cd Python-3.10.18 \
     && ./configure \
@@ -62,7 +61,7 @@ RUN bash -c "python3.10 -m pip install virtualenv \
     && /vpy3/bin/pip install numpy --only-binary=:all: || true \
     && chown -R pillow:pillow /vpy3"
 
-RUN wget https://github.com/ninja-build/ninja/releases/download/v1.13.2/ninja-linux.zip \
+RUN curl -fsSLO https://github.com/ninja-build/ninja/releases/download/v1.13.2/ninja-linux.zip \
     && unzip ninja-linux.zip \
     && mv ninja /usr/bin
 RUN python3.10 -m pip install --no-cache-dir meson

amazon-2023-amd64/Dockerfile

@@ -26,7 +26,7 @@ RUN yum install -y \
     tar \
     unzip \
     util-linux \
-    wget \
+    curl \
     which \
     xorg-x11-server-Xvfb \
     xorg-x11-xauth \
@@ -50,7 +50,7 @@ RUN bash -c "/usr/bin/python3.11 -m pip install virtualenv \
     && chown -R pillow:pillow /vpy3"
 
 COPY depends /depends
-RUN wget https://github.com/ninja-build/ninja/releases/download/v1.13.2/ninja-linux.zip \
+RUN curl -fsSLO https://github.com/ninja-build/ninja/releases/download/v1.13.2/ninja-linux.zip \
     && unzip ninja-linux.zip \
     && mv ninja /usr/bin
 RUN /usr/bin/python3.11 -m pip install meson