switching to sapmachine-17.0.13 and avoiding mail error output during startup if mail is not installed

This commit is contained in:
Axel Uhl
2025-01-27 00:02:20 +01:00
parent da1e576905
commit 44c4b70f4e
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM sapmachine:17.0.11 FROM sapmachine:17.0.13
# This Dockerfile assumes that the release to use is provided as # This Dockerfile assumes that the release to use is provided as
# ${RELEASE}.tar.gz in the current Docker workspace. Use, e.g., # ${RELEASE}.tar.gz in the current Docker workspace. Use, e.g.,
# the configuration/github-download-release-assets.sh script to # the configuration/github-download-release-assets.sh script to
@@ -1,4 +1,4 @@
FROM sapmachine:17.0.11 FROM sapmachine:17.0.13
LABEL maintainer=axel.uhl@sap.com LABEL maintainer=axel.uhl@sap.com
# Download and extract the release # Download and extract the release
WORKDIR /home/sailing WORKDIR /home/sailing
+1 -1
View File
@@ -72,7 +72,7 @@ CODE_DIRECTORY=code
# Figuring out what the "mail" tool version is so we # Figuring out what the "mail" tool version is so we
# can know whether it requires -a or -A to attach a file: # can know whether it requires -a or -A to attach a file:
if mail -V | grep -q "GNU Mailutils"; then if mail -V | grep -q "GNU Mailutils" 2>/dev/null; then
MAIL_ATTACH_OPTION="-A" MAIL_ATTACH_OPTION="-A"
else else
MAIL_ATTACH_OPTION="-a" MAIL_ATTACH_OPTION="-a"