From 28b7aade7fc2fc520f910e82edb55f039661da06 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 8 Dec 2022 06:23:53 +0100 Subject: [PATCH] Ensure mhsendmail is available on arm64 --- .ansible/group_vars/all/slim.yml | 12 +++++++----- Dockerfiles/slim/Dockerfile-5.2 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-5.3 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-5.4 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-5.5 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-5.6 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-7.0 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-7.1 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-7.2 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-7.3 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-7.4 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-8.0 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-8.1 | 13 ++++++++----- Dockerfiles/slim/Dockerfile-8.2 | 13 ++++++++----- 14 files changed, 111 insertions(+), 70 deletions(-) diff --git a/.ansible/group_vars/all/slim.yml b/.ansible/group_vars/all/slim.yml index bd5fec0..b5c7333 100644 --- a/.ansible/group_vars/all/slim.yml +++ b/.ansible/group_vars/all/slim.yml @@ -273,15 +273,17 @@ base_software_available: ### mhsendmail ### mhsendmail: + check: mhsendmail -h 2>&1 | grep 'Usage' all: type: custom command: | - if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ diff --git a/Dockerfiles/slim/Dockerfile-5.2 b/Dockerfiles/slim/Dockerfile-5.2 index 5a562c8..46a759b 100644 --- a/Dockerfiles/slim/Dockerfile-5.2 +++ b/Dockerfiles/slim/Dockerfile-5.2 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -378,6 +380,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-5.3 b/Dockerfiles/slim/Dockerfile-5.3 index 1188340..31c4b8d 100644 --- a/Dockerfiles/slim/Dockerfile-5.3 +++ b/Dockerfiles/slim/Dockerfile-5.3 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -378,6 +380,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-5.4 b/Dockerfiles/slim/Dockerfile-5.4 index 93de2d5..4232c58 100644 --- a/Dockerfiles/slim/Dockerfile-5.4 +++ b/Dockerfiles/slim/Dockerfile-5.4 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -378,6 +380,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-5.5 b/Dockerfiles/slim/Dockerfile-5.5 index 188806f..d11cdf2 100644 --- a/Dockerfiles/slim/Dockerfile-5.5 +++ b/Dockerfiles/slim/Dockerfile-5.5 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -378,6 +380,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-5.6 b/Dockerfiles/slim/Dockerfile-5.6 index 54c6512..310e3eb 100644 --- a/Dockerfiles/slim/Dockerfile-5.6 +++ b/Dockerfiles/slim/Dockerfile-5.6 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -382,6 +384,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-7.0 b/Dockerfiles/slim/Dockerfile-7.0 index de54d2c..6f269b7 100644 --- a/Dockerfiles/slim/Dockerfile-7.0 +++ b/Dockerfiles/slim/Dockerfile-7.0 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -382,6 +384,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-7.1 b/Dockerfiles/slim/Dockerfile-7.1 index 7e3cf59..5e85e85 100644 --- a/Dockerfiles/slim/Dockerfile-7.1 +++ b/Dockerfiles/slim/Dockerfile-7.1 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -376,6 +378,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-7.2 b/Dockerfiles/slim/Dockerfile-7.2 index b328a9b..9020b33 100644 --- a/Dockerfiles/slim/Dockerfile-7.2 +++ b/Dockerfiles/slim/Dockerfile-7.2 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -376,6 +378,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-7.3 b/Dockerfiles/slim/Dockerfile-7.3 index 4886416..a844a4d 100644 --- a/Dockerfiles/slim/Dockerfile-7.3 +++ b/Dockerfiles/slim/Dockerfile-7.3 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -376,6 +378,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-7.4 b/Dockerfiles/slim/Dockerfile-7.4 index 48430b7..abf916c 100644 --- a/Dockerfiles/slim/Dockerfile-7.4 +++ b/Dockerfiles/slim/Dockerfile-7.4 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -376,6 +378,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-8.0 b/Dockerfiles/slim/Dockerfile-8.0 index c1e297c..1f0336b 100644 --- a/Dockerfiles/slim/Dockerfile-8.0 +++ b/Dockerfiles/slim/Dockerfile-8.0 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -376,6 +378,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-8.1 b/Dockerfiles/slim/Dockerfile-8.1 index 3997145..58b35e4 100644 --- a/Dockerfiles/slim/Dockerfile-8.1 +++ b/Dockerfiles/slim/Dockerfile-8.1 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -376,6 +378,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- diff --git a/Dockerfiles/slim/Dockerfile-8.2 b/Dockerfiles/slim/Dockerfile-8.2 index 5cddeac..6a23e31 100644 --- a/Dockerfiles/slim/Dockerfile-8.2 +++ b/Dockerfiles/slim/Dockerfile-8.2 @@ -67,15 +67,17 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ - && if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \ - curl -sS -L --fail https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 > mhsendmail_linux_amd64 \ - && chmod +x mhsendmail_linux_amd64 \ - && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail; \ + && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ + && if [ "${DEB_HOST_ARCH}" = "amd64" ] || [ "${DEB_HOST_ARCH}" = "arm64" ]; then \ + MHSENDMAIL_URL="https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_${DEB_HOST_ARCH}" \ + && curl -sS -L --fail "${MHSENDMAIL_URL}" > /usr/local/bin/mhsendmail \ + && chmod +x /usr/local/bin/mhsendmail; \ else \ - printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for arm64."' 'exit 1' > /usr/local/bin/mhsendmail \ + printf '%s\n%s\n%s\n' '#!/bin/sh' 'echo "Not available for this platform."' 'exit 1' > /usr/local/bin/mhsendmail \ && chmod +x /usr/local/bin/mhsendmail; \ fi \ \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client -------------------- @@ -376,6 +378,7 @@ RUN set -eux \ # -------------------- mhsendmail -------------------- RUN set -eux \ + && mhsendmail -h 2>&1 | grep 'Usage' \ && true # -------------------- mongo_client --------------------