Compare commits

...

3 Commits

Author SHA1 Message Date
8d085f1f93 Merge pull request 'Add additional output to docker console' (#14) from additional-debug into develop
All checks were successful
Build Develop Image / Build Image (push) Successful in 7m21s
Build Develop Image / Notify (push) Successful in 2s
Reviewed-on: #14
2024-04-19 14:11:29 +00:00
7338ee133e Add stderr redirect for cron
All checks were successful
Test Pull Requests / Build Image (pull_request) Successful in 7m41s
Test Pull Requests / Notify (pull_request) Successful in 2s
2024-04-19 13:13:18 +00:00
082c86667a Add logging from docker 2024-04-19 13:12:39 +00:00

View File

@ -28,11 +28,17 @@ RUN echo "${DOCKER_PRUNE_INTERVAL} echo Pruning docker volumes && docker volume
# Remove warning from supervisord about running as root # Remove warning from supervisord about running as root
RUN sed -i '/\[supervisord\]/a user=root' /etc/supervisord.conf RUN sed -i '/\[supervisord\]/a user=root' /etc/supervisord.conf
# Add stdout/stderr logs for docker
RUN sed -i '/\[program:dockerd\]/a stdout_logfile_maxbytes=0' /etc/supervisord.conf && \
sed -i '/\[program:dockerd\]/a stdout_logfile=/dev/fd/1' /etc/supervisord.conf && \
sed -i '/\[program:dockerd\]/a redirect_stderr=true' /etc/supervisord.conf
# Add Cron to supervisord # Add Cron to supervisord
RUN echo "" >> /etc/supervisord.conf && \ RUN echo "" >> /etc/supervisord.conf && \
echo "[program:cron]" >> /etc/supervisord.conf && \ echo "[program:cron]" >> /etc/supervisord.conf && \
echo "command=/usr/sbin/crond -f" >> /etc/supervisord.conf && \ echo "command=/usr/sbin/crond -f" >> /etc/supervisord.conf && \
echo "stdout_logfile=/dev/fd/1" >> /etc/supervisord.conf && \ echo "stdout_logfile=/dev/fd/1" >> /etc/supervisord.conf && \
echo "stdout_logfile_maxbytes=0" >> /etc/supervisord.conf echo "stdout_logfile_maxbytes=0" >> /etc/supervisord.conf && \
echo "redirect_stderr=true" >> /etc/supervisord.conf
ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]