Fix mhsendmail install

2025-12-11 03:21:15 +00:00 · 2022-03-23 00:27:00 +01:00
parent dc15215156
commit 176f48d063
14 changed files with 13 additions and 27 deletions
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -206,8 +206,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -228,8 +228,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -257,8 +257,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -262,8 +262,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -278,8 +278,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -259,8 +259,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -258,8 +258,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -277,8 +277,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -278,8 +278,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -278,8 +278,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -231,8 +231,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -231,8 +231,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/Dockerfiles/work/Dockerfile-8.2
+++ b/Dockerfiles/work/Dockerfile-8.2
@@ -220,8 +220,7 @@ RUN set -eux \
 \
 	\
 # -------------------- mhsendmail --------------------
-	&& # Only on amd64 systems
-if [ "$(dpkg-architecture --query DEB_HOST_ARCH)" = "amd64" ]; then \
+	&& 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; \
--- a/build/ansible/group_vars/all/work.yml
+++ b/build/ansible/group_vars/all/work.yml
@@ -711,7 +711,6 @@ software_available:
  mhsendmail:
    all:
      command: |
-        # Only on amd64 systems
        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 \