From 618339dd93da9e892a8783983ccdf86f097f49c2 Mon Sep 17 00:00:00 2001
From: Andreas Mautz <andreas.mautz@wilma.tech>
Date: Tue, 4 Mar 2025 15:38:29 +0100
Subject: [PATCH] [INFRA] fix hadolint errors

---
 src/7.4/src/Dockerfile | 27 ++++++++++++++++-----------
 src/8.0/src/Dockerfile | 27 ++++++++++++++++-----------
 src/8.1/src/Dockerfile | 27 ++++++++++++++++-----------
 src/8.2/src/Dockerfile | 27 ++++++++++++++++-----------
 src/8.3/src/Dockerfile | 30 +++++++++++++++++-------------
 src/8.4/src/Dockerfile | 27 ++++++++++++++++-----------
 6 files changed, 97 insertions(+), 68 deletions(-)

diff --git a/src/7.4/src/Dockerfile b/src/7.4/src/Dockerfile
index 9e1ba9e..f9abaaf 100644
--- a/src/7.4/src/Dockerfile
+++ b/src/7.4/src/Dockerfile
@@ -26,28 +26,34 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
 
 ### configure php
 # hadolint ignore=DL4006,SC2039,DL3003
-# hadolint ignore=DL4006,SC2039,DL3003
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN set -xe; \
     \
     chmod 755 /usr/local/bin/docker-entrypoint; \
     /usr/local/bin/docker-install-requirements php; \
     ln -fs /etc/alternatives/vi /usr/bin/vim; \
     mkdir -p /tmp/mhsendmail; \
-    cd /tmp/mhsendmail; \
+    mkdir -p "${PHP_INI_DIR}/conf.d"; \
+    mkdir -p /usr/src;
+WORKDIR /tmp/mhsendmail
+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; \
-    mkdir -p "${PHP_INI_DIR}/conf.d"; \
-    mkdir -p /usr/src; \
-    cd /usr/src; \
+WORKDIR /usr/src
+RUN set -xe; \
+    \
     curl -fsSL -o php.tar.xz "$PHP_URL"; \
-    docker-php-source extract; \
+    docker-php-source extract;
+WORKDIR /usr/src/php
+RUN set -xe; \
+    \
     gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     if [ ! -d "/usr/include/curl" ]; then \
         ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
     fi; \
-    cd /usr/src/php; \
     export \
         CFLAGS="$PHP_CFLAGS" \
         CPPFLAGS="$PHP_CPPFLAGS" \
@@ -180,10 +186,9 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
-# hadolint ignore=DL4006
-RUN set -xe; \
-    \
-    /usr/local/bin/docker-install-requirements toolbox; \
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
+
+RUN /usr/local/bin/docker-install-requirements toolbox; \
     curl https://rclone.org/install.sh | bash; \
     composer require deployer/deployer; \
     composer update; \
diff --git a/src/8.0/src/Dockerfile b/src/8.0/src/Dockerfile
index f9ff5e8..11ce135 100644
--- a/src/8.0/src/Dockerfile
+++ b/src/8.0/src/Dockerfile
@@ -26,28 +26,34 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
 
 ### configure php
 # hadolint ignore=DL4006,SC2039,DL3003
-# hadolint ignore=DL4006,SC2039,DL3003
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN set -xe; \
     \
     chmod 755 /usr/local/bin/docker-entrypoint; \
     /usr/local/bin/docker-install-requirements php; \
     ln -fs /etc/alternatives/vi /usr/bin/vim; \
     mkdir -p /tmp/mhsendmail; \
-    cd /tmp/mhsendmail; \
+    mkdir -p "${PHP_INI_DIR}/conf.d"; \
+    mkdir -p /usr/src;
+WORKDIR /tmp/mhsendmail
+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; \
-    mkdir -p "${PHP_INI_DIR}/conf.d"; \
-    mkdir -p /usr/src; \
-    cd /usr/src; \
+WORKDIR /usr/src
+RUN set -xe; \
+    \
     curl -fsSL -o php.tar.xz "$PHP_URL"; \
-    docker-php-source extract; \
+    docker-php-source extract;
+WORKDIR /usr/src/php
+RUN set -xe; \
+    \
     gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     if [ ! -d "/usr/include/curl" ]; then \
         ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
     fi; \
-    cd /usr/src/php; \
     export \
         CFLAGS="$PHP_CFLAGS" \
         CPPFLAGS="$PHP_CPPFLAGS" \
@@ -180,10 +186,9 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
-# hadolint ignore=DL4006
-RUN set -xe; \
-    \
-    /usr/local/bin/docker-install-requirements toolbox; \
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
+
+RUN /usr/local/bin/docker-install-requirements toolbox; \
     curl https://rclone.org/install.sh | bash; \
     composer require deployer/deployer; \
     composer update; \
diff --git a/src/8.1/src/Dockerfile b/src/8.1/src/Dockerfile
index 39e7fa5..0179cdf 100644
--- a/src/8.1/src/Dockerfile
+++ b/src/8.1/src/Dockerfile
@@ -26,28 +26,34 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
 
 ### configure php
 # hadolint ignore=DL4006,SC2039,DL3003
-# hadolint ignore=DL4006,SC2039,DL3003
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN set -xe; \
     \
     chmod 755 /usr/local/bin/docker-entrypoint; \
     /usr/local/bin/docker-install-requirements php; \
     ln -fs /etc/alternatives/vi /usr/bin/vim; \
     mkdir -p /tmp/mhsendmail; \
-    cd /tmp/mhsendmail; \
+    mkdir -p "${PHP_INI_DIR}/conf.d"; \
+    mkdir -p /usr/src;
+WORKDIR /tmp/mhsendmail
+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; \
-    mkdir -p "${PHP_INI_DIR}/conf.d"; \
-    mkdir -p /usr/src; \
-    cd /usr/src; \
+WORKDIR /usr/src
+RUN set -xe; \
+    \
     curl -fsSL -o php.tar.xz "$PHP_URL"; \
-    docker-php-source extract; \
+    docker-php-source extract;
+WORKDIR /usr/src/php
+RUN set -xe; \
+    \
     gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     if [ ! -d "/usr/include/curl" ]; then \
         ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
     fi; \
-    cd /usr/src/php; \
     export \
         CFLAGS="$PHP_CFLAGS" \
         CPPFLAGS="$PHP_CPPFLAGS" \
@@ -180,10 +186,9 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
-# hadolint ignore=DL4006
-RUN set -xe; \
-    \
-    /usr/local/bin/docker-install-requirements toolbox; \
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
+
+RUN /usr/local/bin/docker-install-requirements toolbox; \
     curl https://rclone.org/install.sh | bash; \
     composer require deployer/deployer; \
     composer update; \
diff --git a/src/8.2/src/Dockerfile b/src/8.2/src/Dockerfile
index 372a233..f660f9b 100644
--- a/src/8.2/src/Dockerfile
+++ b/src/8.2/src/Dockerfile
@@ -26,28 +26,34 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
 
 ### configure php
 # hadolint ignore=DL4006,SC2039,DL3003
-# hadolint ignore=DL4006,SC2039,DL3003
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN set -xe; \
     \
     chmod 755 /usr/local/bin/docker-entrypoint; \
     /usr/local/bin/docker-install-requirements php; \
     ln -fs /etc/alternatives/vi /usr/bin/vim; \
     mkdir -p /tmp/mhsendmail; \
-    cd /tmp/mhsendmail; \
+    mkdir -p "${PHP_INI_DIR}/conf.d"; \
+    mkdir -p /usr/src;
+WORKDIR /tmp/mhsendmail
+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; \
-    mkdir -p "${PHP_INI_DIR}/conf.d"; \
-    mkdir -p /usr/src; \
-    cd /usr/src; \
+WORKDIR /usr/src
+RUN set -xe; \
+    \
     curl -fsSL -o php.tar.xz "$PHP_URL"; \
-    docker-php-source extract; \
+    docker-php-source extract;
+WORKDIR /usr/src/php
+RUN set -xe; \
+    \
     gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     if [ ! -d "/usr/include/curl" ]; then \
         ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
     fi; \
-    cd /usr/src/php; \
     export \
         CFLAGS="$PHP_CFLAGS" \
         CPPFLAGS="$PHP_CPPFLAGS" \
@@ -180,10 +186,9 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
-# hadolint ignore=DL4006
-RUN set -xe; \
-    \
-    /usr/local/bin/docker-install-requirements toolbox; \
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
+
+RUN /usr/local/bin/docker-install-requirements toolbox; \
     curl https://rclone.org/install.sh | bash; \
     composer require deployer/deployer; \
     composer update; \
diff --git a/src/8.3/src/Dockerfile b/src/8.3/src/Dockerfile
index c831fb7..3431ae4 100644
--- a/src/8.3/src/Dockerfile
+++ b/src/8.3/src/Dockerfile
@@ -26,28 +26,34 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
 
 ### configure php
 # hadolint ignore=DL4006,SC2039,DL3003
-# hadolint ignore=DL4006,SC2039,DL3003
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN set -xe; \
     \
     chmod 755 /usr/local/bin/docker-entrypoint; \
     /usr/local/bin/docker-install-requirements php; \
     ln -fs /etc/alternatives/vi /usr/bin/vim; \
     mkdir -p /tmp/mhsendmail; \
-    cd /tmp/mhsendmail; \
+    mkdir -p "${PHP_INI_DIR}/conf.d"; \
+    mkdir -p /usr/src;
+WORKDIR /tmp/mhsendmail
+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; \
-    mkdir -p "${PHP_INI_DIR}/conf.d"; \
-    mkdir -p /usr/src; \
-    cd /usr/src; \
+WORKDIR /usr/src
+RUN set -xe; \
+    \
     curl -fsSL -o php.tar.xz "$PHP_URL"; \
-    docker-php-source extract; \
+    docker-php-source extract;
+WORKDIR /usr/src/php
+RUN set -xe; \
+    \
     gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     if [ ! -d "/usr/include/curl" ]; then \
         ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
     fi; \
-    cd /usr/src/php; \
     export \
         CFLAGS="$PHP_CFLAGS" \
         CPPFLAGS="$PHP_CPPFLAGS" \
@@ -131,8 +137,7 @@ RUN set -xe; \
         echo 'pm.min_spare_servers = 2'; \
         echo 'pm.max_spare_servers = 5'; \
         echo 'pm.status_path = /status'; \
-    } | tee /usr/local/etc/php-fpm.d/zz-docker.conf; \
-    /usr/local/bin/docker-layer-clean
+    } | tee /usr/local/etc/php-fpm.d/zz-docker.conf;
 
 ## configure php extensions
 # hadolint ignore=DL4006,SC2086,DL3003
@@ -181,10 +186,9 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
-# hadolint ignore=DL4006
-RUN set -xe; \
-    \
-    /usr/local/bin/docker-install-requirements toolbox; \
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
+
+RUN /usr/local/bin/docker-install-requirements toolbox; \
     curl https://rclone.org/install.sh | bash; \
     composer require deployer/deployer; \
     composer update; \
diff --git a/src/8.4/src/Dockerfile b/src/8.4/src/Dockerfile
index 85cb25d..2bfd77b 100644
--- a/src/8.4/src/Dockerfile
+++ b/src/8.4/src/Dockerfile
@@ -26,28 +26,34 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \
 
 ### configure php
 # hadolint ignore=DL4006,SC2039,DL3003
-# hadolint ignore=DL4006,SC2039,DL3003
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN set -xe; \
     \
     chmod 755 /usr/local/bin/docker-entrypoint; \
     /usr/local/bin/docker-install-requirements php; \
     ln -fs /etc/alternatives/vi /usr/bin/vim; \
     mkdir -p /tmp/mhsendmail; \
-    cd /tmp/mhsendmail; \
+    mkdir -p "${PHP_INI_DIR}/conf.d"; \
+    mkdir -p /usr/src;
+WORKDIR /tmp/mhsendmail
+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; \
-    mkdir -p "${PHP_INI_DIR}/conf.d"; \
-    mkdir -p /usr/src; \
-    cd /usr/src; \
+WORKDIR /usr/src
+RUN set -xe; \
+    \
     curl -fsSL -o php.tar.xz "$PHP_URL"; \
-    docker-php-source extract; \
+    docker-php-source extract;
+WORKDIR /usr/src/php
+RUN set -xe; \
+    \
     gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
     if [ ! -d "/usr/include/curl" ]; then \
         ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \
     fi; \
-    cd /usr/src/php; \
     export \
         CFLAGS="$PHP_CFLAGS" \
         CPPFLAGS="$PHP_CPPFLAGS" \
@@ -180,10 +186,9 @@ ARG TOOLBOX_RUNTIME_REQUIREMENTS_EXTRA=""
 ARG TOOLBOX_BUILD_REQUIREMENTS=""
 ARG TOOLBOX_BUILD_REQUIREMENTS_EXTRA=""
 
-# hadolint ignore=DL4006
-RUN set -xe; \
-    \
-    /usr/local/bin/docker-install-requirements toolbox; \
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
+
+RUN /usr/local/bin/docker-install-requirements toolbox; \
     curl https://rclone.org/install.sh | bash; \
     composer require deployer/deployer; \
     composer update; \