From d6e55c3a1ea158dcb2d356c94147ae9a00d38b16 Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Wed, 5 Mar 2025 10:47:03 +0100 Subject: [PATCH] [INFRA] fix bash and typos --- src/7.4/src/Dockerfile | 6 +++--- src/8.0/src/Dockerfile | 2 +- src/8.1/src/Dockerfile | 2 +- src/8.2/src/Dockerfile | 2 +- src/8.3/src/Dockerfile | 2 +- src/8.4/src/Dockerfile | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/7.4/src/Dockerfile b/src/7.4/src/Dockerfile index f9abaaf..52605e0 100644 --- a/src/7.4/src/Dockerfile +++ b/src/7.4/src/Dockerfile @@ -26,7 +26,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ ### configure php # hadolint ignore=DL4006,SC2039,DL3003 -SHELL ["/bin/ash", "-eo", "pipefail", "-c"] +SHELL ["/bin/bash", "-eo", "pipefail", "-c"] RUN set -xe; \ \ chmod 755 /usr/local/bin/docker-entrypoint; \ @@ -40,7 +40,7 @@ RUN set -xe; \ \ curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \ chmod 0755 /usr/local/bin/mhsendmail; \ - chmod +x /usr/local/bin/mhsendmail; \ + chmod +x /usr/local/bin/mhsendmail; WORKDIR /usr/src RUN set -xe; \ \ @@ -186,7 +186,7 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA="" ARG TOOLBOX_BUILD_REQUIREMENTS="" ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA="" -SHELL ["/bin/ash", "-eo", "pipefail", "-c"] +SHELL ["/bin/bash", "-eo", "pipefail", "-c"] RUN /usr/local/bin/docker-install-requirements toolbox; \ curl https://rclone.org/install.sh | bash; \ diff --git a/src/8.0/src/Dockerfile b/src/8.0/src/Dockerfile index 11ce135..6e211f5 100644 --- a/src/8.0/src/Dockerfile +++ b/src/8.0/src/Dockerfile @@ -40,7 +40,7 @@ RUN set -xe; \ \ curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \ chmod 0755 /usr/local/bin/mhsendmail; \ - chmod +x /usr/local/bin/mhsendmail; \ + chmod +x /usr/local/bin/mhsendmail; WORKDIR /usr/src RUN set -xe; \ \ diff --git a/src/8.1/src/Dockerfile b/src/8.1/src/Dockerfile index 0179cdf..cb63d28 100644 --- a/src/8.1/src/Dockerfile +++ b/src/8.1/src/Dockerfile @@ -40,7 +40,7 @@ RUN set -xe; \ \ curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \ chmod 0755 /usr/local/bin/mhsendmail; \ - chmod +x /usr/local/bin/mhsendmail; \ + chmod +x /usr/local/bin/mhsendmail; WORKDIR /usr/src RUN set -xe; \ \ diff --git a/src/8.2/src/Dockerfile b/src/8.2/src/Dockerfile index f660f9b..f53a903 100644 --- a/src/8.2/src/Dockerfile +++ b/src/8.2/src/Dockerfile @@ -40,7 +40,7 @@ RUN set -xe; \ \ curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \ chmod 0755 /usr/local/bin/mhsendmail; \ - chmod +x /usr/local/bin/mhsendmail; \ + chmod +x /usr/local/bin/mhsendmail; WORKDIR /usr/src RUN set -xe; \ \ diff --git a/src/8.3/src/Dockerfile b/src/8.3/src/Dockerfile index 3431ae4..d704980 100644 --- a/src/8.3/src/Dockerfile +++ b/src/8.3/src/Dockerfile @@ -40,7 +40,7 @@ RUN set -xe; \ \ curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \ chmod 0755 /usr/local/bin/mhsendmail; \ - chmod +x /usr/local/bin/mhsendmail; \ + chmod +x /usr/local/bin/mhsendmail; WORKDIR /usr/src RUN set -xe; \ \ diff --git a/src/8.4/src/Dockerfile b/src/8.4/src/Dockerfile index 2bfd77b..3dfcc26 100644 --- a/src/8.4/src/Dockerfile +++ b/src/8.4/src/Dockerfile @@ -26,7 +26,7 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ ### configure php # hadolint ignore=DL4006,SC2039,DL3003 -SHELL ["/bin/ash", "-eo", "pipefail", "-c"] +SHELL ["/bin/bash", "-eo", "pipefail", "-c"] RUN set -xe; \ \ chmod 755 /usr/local/bin/docker-entrypoint; \ @@ -40,7 +40,7 @@ RUN set -xe; \ \ curl -LkSso /usr/local/bin/mhsendmail 'https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64'&& \ chmod 0755 /usr/local/bin/mhsendmail; \ - chmod +x /usr/local/bin/mhsendmail; \ + chmod +x /usr/local/bin/mhsendmail; WORKDIR /usr/src RUN set -xe; \ \ @@ -186,7 +186,7 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA="" ARG TOOLBOX_BUILD_REQUIREMENTS="" ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA="" -SHELL ["/bin/ash", "-eo", "pipefail", "-c"] +SHELL ["/bin/bash", "-eo", "pipefail", "-c"] RUN /usr/local/bin/docker-install-requirements toolbox; \ curl https://rclone.org/install.sh | bash; \