Skip to content

Commit adbe1d2

Browse files
committed
Fix DL4001: Either use Wget or Curl but not both
1 parent 56abaf4 commit adbe1d2

File tree

8 files changed

+7
-13
lines changed

8 files changed

+7
-13
lines changed

.hadolint.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ ignored:
99
- DL3041 # Pin versions in dnf install
1010
- DL3047 # Avoid use of wget without progress bar
1111
- DL3059 # Multiple consecutive RUN instructions
12-
- DL4001 # Either use Wget or Curl but not both
1312
- SC2016 # Expressions don't expand in single quotes

amazon-2-amd64/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ FROM amazonlinux:2
22

33
RUN yum install -y \
44
cmake \
5-
curl \
65
findutils \
76
fribidi-devel \
87
gcc \
@@ -31,7 +30,7 @@ RUN yum install -y \
3130
&& yum clean all
3231

3332
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
34-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
33+
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y
3534
ENV PATH="/root/.cargo/bin:${PATH}"
3635

3736
RUN useradd --uid 1001 pillow

amazon-2023-amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN yum install -y \
3434
&& yum clean all
3535

3636
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
37-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
37+
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y
3838
ENV PATH="/root/.cargo/bin:${PATH}"
3939

4040
RUN useradd --uid 1001 pillow

centos-stream-9-amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN yum install -y \
3434

3535
RUN useradd --uid 1001 pillow
3636

37-
RUN wget https://www.python.org/ftp/python/3.10.18/Python-3.10.18.tgz \
37+
RUN wget --no-verbose https://www.python.org/ftp/python/3.10.18/Python-3.10.18.tgz \
3838
&& tar xzf Python-3.10.18.tgz \
3939
&& cd Python-3.10.18 \
4040
&& ./configure \

debian-12-bookworm-amd64/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
3434
RUN apt-get -qq update \
3535
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
3636
cmake \
37-
curl \
3837
g++ \
3938
gcc \
4039
ghostscript \
@@ -67,7 +66,7 @@ RUN apt-get -qq update \
6766
&& rm -rf /var/lib/apt/lists/*
6867

6968
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
70-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
69+
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y
7170
ENV PATH="/root/.cargo/bin:${PATH}"
7271

7372
RUN useradd --uid 1001 pillow \

debian-12-bookworm-x86/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
3434
RUN apt-get -qq update \
3535
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
3636
cmake \
37-
curl \
3837
g++ \
3938
gcc \
4039
ghostscript \
@@ -67,7 +66,7 @@ RUN apt-get -qq update \
6766
&& rm -rf /var/lib/apt/lists/*
6867

6968
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
70-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
69+
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
7170
ENV PATH="/root/.cargo/bin:${PATH}"
7271

7372
RUN useradd -u 1001 pillow \

debian-13-trixie-amd64/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
3434
RUN apt-get -qq update \
3535
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
3636
cmake \
37-
curl \
3837
g++ \
3938
gcc \
4039
ghostscript \
@@ -67,7 +66,7 @@ RUN apt-get -qq update \
6766
&& rm -rf /var/lib/apt/lists/*
6867

6968
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
70-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
69+
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y
7170
ENV PATH="/root/.cargo/bin:${PATH}"
7271

7372
RUN useradd --uid 1001 pillow \

debian-13-trixie-x86/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
3434
RUN apt-get -qq update \
3535
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
3636
cmake \
37-
curl \
3837
g++ \
3938
gcc \
4039
ghostscript \
@@ -67,7 +66,7 @@ RUN apt-get -qq update \
6766
&& rm -rf /var/lib/apt/lists/*
6867

6968
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
70-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
69+
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
7170
ENV PATH="/root/.cargo/bin:${PATH}"
7271

7372
RUN useradd -u 1001 pillow \

0 commit comments

Comments
 (0)