Skip to content

Commit fdfe912

Browse files
Merge pull request #66 from wilma-digital/main
[INFRA] fix bash and typos
2 parents fabf411 + d6e55c3 commit fdfe912

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

src/7.4/src/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
2626

2727
### configure php
2828
# hadolint ignore=DL4006,SC2039,DL3003
29-
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
29+
SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
3030
RUN set -xe; \
3131
\
3232
chmod 755 /usr/local/bin/docker-entrypoint; \
@@ -40,7 +40,7 @@ RUN set -xe; \
4040
\
4141
curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \
4242
chmod 0755 /usr/local/bin/mhsendmail; \
43-
chmod +x /usr/local/bin/mhsendmail; \
43+
chmod +x /usr/local/bin/mhsendmail;
4444
WORKDIR /usr/src
4545
RUN set -xe; \
4646
\
@@ -186,7 +186,7 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
186186
ARG TOOLBOX_BUILD_REQUIREMENTS=""
187187
ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
188188

189-
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
189+
SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
190190

191191
RUN /usr/local/bin/docker-install-requirements toolbox; \
192192
curl https://rclone.org/install.sh | bash; \

src/8.0/src/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN set -xe; \
4040
\
4141
curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \
4242
chmod 0755 /usr/local/bin/mhsendmail; \
43-
chmod +x /usr/local/bin/mhsendmail; \
43+
chmod +x /usr/local/bin/mhsendmail;
4444
WORKDIR /usr/src
4545
RUN set -xe; \
4646
\

src/8.1/src/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN set -xe; \
4040
\
4141
curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \
4242
chmod 0755 /usr/local/bin/mhsendmail; \
43-
chmod +x /usr/local/bin/mhsendmail; \
43+
chmod +x /usr/local/bin/mhsendmail;
4444
WORKDIR /usr/src
4545
RUN set -xe; \
4646
\

src/8.2/src/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN set -xe; \
4040
\
4141
curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \
4242
chmod 0755 /usr/local/bin/mhsendmail; \
43-
chmod +x /usr/local/bin/mhsendmail; \
43+
chmod +x /usr/local/bin/mhsendmail;
4444
WORKDIR /usr/src
4545
RUN set -xe; \
4646
\

src/8.3/src/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN set -xe; \
4040
\
4141
curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \
4242
chmod 0755 /usr/local/bin/mhsendmail; \
43-
chmod +x /usr/local/bin/mhsendmail; \
43+
chmod +x /usr/local/bin/mhsendmail;
4444
WORKDIR /usr/src
4545
RUN set -xe; \
4646
\

src/8.4/src/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
2626

2727
### configure php
2828
# hadolint ignore=DL4006,SC2039,DL3003
29-
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
29+
SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
3030
RUN set -xe; \
3131
\
3232
chmod 755 /usr/local/bin/docker-entrypoint; \
@@ -40,7 +40,7 @@ RUN set -xe; \
4040
\
4141
curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \
4242
chmod 0755 /usr/local/bin/mhsendmail; \
43-
chmod +x /usr/local/bin/mhsendmail; \
43+
chmod +x /usr/local/bin/mhsendmail;
4444
WORKDIR /usr/src
4545
RUN set -xe; \
4646
\
@@ -186,7 +186,7 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
186186
ARG TOOLBOX_BUILD_REQUIREMENTS=""
187187
ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
188188

189-
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
189+
SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
190190

191191
RUN /usr/local/bin/docker-install-requirements toolbox; \
192192
curl https://rclone.org/install.sh | bash; \

0 commit comments

Comments
 (0)