Skip to content

Commit 0764380

Browse files
authored
Move SHELL command earlier (#6)
2 parents 48bafa9 + 92a59a8 commit 0764380

File tree

9 files changed

+15
-9
lines changed

9 files changed

+15
-9
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ permissions: {}
66

77
env:
88
FORCE_COLOR: 1
9-
RUFF_OUTPUT_FORMAT: github
109

1110
concurrency:
1211
group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,7 +14,7 @@ concurrency:
1514
jobs:
1615
lint:
1716
runs-on: ubuntu-latest
18-
17+
name: Lint
1918
steps:
2019
- uses: actions/checkout@v6
2120
with:
File renamed without changes.

amazon-2-amd64/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM amazonlinux:2
22

3+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
4+
35
RUN yum install -y \
46
cmake \
57
findutils \
@@ -29,7 +31,6 @@ RUN yum install -y \
2931
zlib-devel \
3032
&& yum clean all
3133

32-
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
3334
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y
3435
ENV PATH="/root/.cargo/bin:${PATH}"
3536

amazon-2023-amd64/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM amazonlinux:2023
22

3+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
4+
35
RUN yum install -y \
46
cmake \
57
findutils \
@@ -33,7 +35,6 @@ RUN yum install -y \
3335
zlib-devel \
3436
&& yum clean all
3537

36-
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
3738
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y
3839
ENV PATH="/root/.cargo/bin:${PATH}"
3940

debian-12-bookworm-amd64/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
3131
# Pillow customization
3232
#
3333

34+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
35+
3436
RUN apt-get -qq update \
3537
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
3638
cmake \
@@ -65,7 +67,6 @@ RUN apt-get -qq update \
6567
zlib1g-dev \
6668
&& rm -rf /var/lib/apt/lists/*
6769

68-
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
6970
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y
7071
ENV PATH="/root/.cargo/bin:${PATH}"
7172

debian-12-bookworm-x86/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
3131
# Pillow customization
3232
#
3333

34+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
35+
3436
RUN apt-get -qq update \
3537
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
3638
cmake \
@@ -65,7 +67,6 @@ RUN apt-get -qq update \
6567
zlib1g-dev \
6668
&& rm -rf /var/lib/apt/lists/*
6769

68-
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
6970
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
7071
ENV PATH="/root/.cargo/bin:${PATH}"
7172

debian-13-trixie-amd64/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
3131
# Pillow customization
3232
#
3333

34+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
35+
3436
RUN apt-get -qq update \
3537
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
3638
cmake \
@@ -65,7 +67,6 @@ RUN apt-get -qq update \
6567
zlib1g-dev \
6668
&& rm -rf /var/lib/apt/lists/*
6769

68-
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
6970
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y
7071
ENV PATH="/root/.cargo/bin:${PATH}"
7172

debian-13-trixie-x86/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
3131
# Pillow customization
3232
#
3333

34+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
35+
3436
RUN apt-get -qq update \
3537
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
3638
cmake \
@@ -65,7 +67,6 @@ RUN apt-get -qq update \
6567
zlib1g-dev \
6668
&& rm -rf /var/lib/apt/lists/*
6769

68-
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
6970
RUN wget -qO- https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
7071
ENV PATH="/root/.cargo/bin:${PATH}"
7172

ubuntu-22.04-jammy-amd64-valgrind/Dockerfile-dbg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ RUN echo "deb http://ddebs.ubuntu.com jammy main restricted universe multiverse"
77
RUN echo "deb http://ddebs.ubuntu.com jammy-updates main restricted universe multiverse" >> /etc/apt/sources.list.d/ddebs.list
88
RUN perl -pi -e 's/# deb-src/deb-src/;' /etc/apt/sources.list
99

10-
RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
10+
RUN apt-get -qq update \
11+
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
1112
libfreetype6-dbgsym \
1213
libtiff5-dbgsym \
1314
libwebpmux3-dbgsym \

0 commit comments

Comments
 (0)