Skip to content

Commit 0a396bd

Browse files
committed
Add busybox-syslogd to redirect DMA log output to STDERR
1 parent 563bfea commit 0a396bd

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

Dockerfile.slim.apache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,5 +399,5 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
399399
ONBUILD ARG INSTALL_DMA
400400
ONBUILD RUN if [ -n "$INSTALL_DMA" ]; then \
401401
sudo apt-get update && \
402-
sudo -E apt-get install -y --no-install-recommends dma; \
402+
sudo -E apt-get install -y --no-install-recommends dma busybox-syslogd; \
403403
fi;

Dockerfile.slim.cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,5 +304,5 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
304304
ONBUILD ARG INSTALL_DMA
305305
ONBUILD RUN if [ -n "$INSTALL_DMA" ]; then \
306306
sudo apt-get update && \
307-
sudo -E apt-get install -y --no-install-recommends dma; \
307+
sudo -E apt-get install -y --no-install-recommends dma busybox-syslogd; \
308308
fi;

Dockerfile.slim.fpm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,5 +327,5 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
327327
ONBUILD ARG INSTALL_DMA
328328
ONBUILD RUN if [ -n "$INSTALL_DMA" ]; then \
329329
sudo apt-get update && \
330-
sudo -E apt-get install -y --no-install-recommends dma; \
330+
sudo -E apt-get install -y --no-install-recommends dma busybox-syslogd; \
331331
fi;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ a single argument before the "FROM" clause in your Dockerfile:
472472

473473
```Dockerfile
474474
ARG INSTALL_DMA=1
475-
FROM thecodingmachine/php:7.4-v3-slim-apache
475+
FROM thecodingmachine/php:8.0-v3-slim-apache
476476
# The build triggers automatically the installation of DragonFly Mail Agent
477477
```
478478

utils/Dockerfile.slim.blueprint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,5 +430,5 @@ ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
430430
ONBUILD ARG INSTALL_DMA
431431
ONBUILD RUN if [ -n "$INSTALL_DMA" ]; then \
432432
sudo apt-get update && \
433-
sudo -E apt-get install -y --no-install-recommends dma; \
433+
sudo -E apt-get install -y --no-install-recommends dma busybox-syslogd; \
434434
fi;

utils/docker-entrypoint-as-root.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,20 @@ if [ -e /usr/sbin/dma ]; then
125125

126126
# generate DMA config based on DMA_CONF_... environment variables
127127
php /usr/local/bin/generate_dma.php > /etc/dma/dma.conf
128-
129-
# generate DMA authentication file based on DMA_AUTH_... environment variables
128+
129+
# generate DMA authentication file based on DMA_AUTH_... environment variables
130130
if [ -n "$DMA_AUTH_USERNAME" ] && [ -n "$DMA_AUTH_PASSWORD" ]; then
131131
if [ -z "$DMA_CONF_SMARTHOST" ]; then
132132
echo "DMA_AUTH_USERNAME and DMA_AUTH_PASSWORD are set, but DMA_CONF_SMARTHOST is empty - not attempting authentication" >&2
133133
else
134134
echo "$DMA_AUTH_USERNAME|$DMA_CONF_SMARTHOST:$DMA_AUTH_PASSWORD" > /etc/dma/auth.conf
135135
fi
136136
fi
137+
138+
# start BusyBox syslogd to log DMA errors to STDERR
139+
# unfortunately DMA doesn't support any other way of logging
140+
# tini will luckily make sure that syslogd will be killed together with any other processes
141+
syslogd -n -O - -l 6 | grep --color=never -E '\bmail\.\S+\s+dma\b' >&2 &
137142
fi
138143

139144
sudo chown docker:docker /opt/php_env_var_cache.php

0 commit comments

Comments
 (0)