Compare commits

...

8 Commits

Author SHA1 Message Date
David Bomba
d75b8e3616 Merge pull request #789 from benbrummer/debian
Workaround: Disable SSL for mariadb-client for compatibility with MySQL
2025-09-02 06:22:16 +10:00
benbrummer
085df042c1 Workaround: Disable SSL for mariadb-client for compatibility with MySQL 2025-09-01 21:36:45 +02:00
David Bomba
b67f49b9ba Merge pull request #784 from benbrummer/debian
HEALTHCHECK, mariadb-client and PHP 8.4
2025-08-29 22:02:27 +10:00
benbrummer
d1621f0fe5 PHP 8.4
Signed-off-by: benbrummer <info@benjamin-brummer.de>
2025-08-29 12:57:55 +02:00
benbrummer
61728ec89b Fix mariadb-client connection to mysql
Debian Trixie has a new mariadb-client, with encryption by default

Signed-off-by: benbrummer <info@benjamin-brummer.de>
2025-08-29 12:51:27 +02:00
benbrummer
1bda3e5809 Use health endpoint for HEALTHCHECK
Signed-off-by: benbrummer <info@benjamin-brummer.de>
2025-08-29 08:02:56 +02:00
David Bomba
6a16f6f4de Merge pull request #770 from TheNewSound/debian
Use default supervisord config as baseline
2025-08-12 08:34:16 +10:00
v
68cfe612ee Start supervisord using /etc/supervisor/supervisord.conf so that a socket at /var/run is created (default supervisord config). 2025-08-01 15:45:54 +02:00
3 changed files with 11 additions and 10 deletions

14
debian/Dockerfile vendored
View File

@@ -1,4 +1,4 @@
ARG PHP=8.3
ARG PHP=8.4
FROM php:${PHP}-fpm AS prepare-app
@@ -23,6 +23,7 @@ ARG php_extra="opcache"
# Install system dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
libfcgi-bin \
mariadb-client \
gpg \
supervisor \
@@ -41,7 +42,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get install -y --no-install-recommends google-chrome-stable; \
elif [ "$(dpkg --print-architecture)" = "arm64" ]; then \
apt-get install -y --no-install-recommends \
chromium; \
chromium; \
fi \
# Create config directory for chromium/google-chrome-stable
&& mkdir /var/www/.config \
@@ -67,6 +68,9 @@ COPY php/php.ini /usr/local/etc/php/conf.d/invoiceninja.ini
COPY php/php-fpm.conf /usr/local/etc/php-fpm.d/invoiceninja.conf
# Workaround: Disable SSL for mariadb-client for compatibility with MySQL
RUN echo "skip-ssl = true" >> /etc/mysql/mariadb.conf.d/50-client.cnf
# Setup supervisor
COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
@@ -78,8 +82,8 @@ COPY --from=prepare-app /tmp/public /tmp/public
COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh
# Health check
HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
CMD pgrep -f "php-fpm: master process"
HEALTHCHECK --start-period=10s \
CMD REMOTE_ADDR=127.0.0.1 REQUEST_URI=/health REQUEST_METHOD=GET SCRIPT_FILENAME=/var/www/html/public/index.php cgi-fcgi -bind -connect 127.0.0.1:9000 | grep '{"status":"ok","message":"API is healthy"}'
ENTRYPOINT ["/usr/local/bin/init.sh"]
CMD ["supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
CMD ["supervisord", "-c", "/etc/supervisor/supervisord.conf"]

View File

@@ -7,7 +7,7 @@ elif [ "$(dpkg --print-architecture)" = "arm64" ]; then
export SNAPPDF_CHROMIUM_PATH=/usr/bin/chromium
fi
if [ "$*" = 'supervisord -c /etc/supervisor/conf.d/supervisord.conf' ]; then
if [ "$*" = 'supervisord -c /etc/supervisor/supervisord.conf' ]; then
# Check for required folders and create if needed
[ -d /var/www/html/storage/framework/sessions ] || mkdir -p /var/www/html/storage/framework/sessions
@@ -64,4 +64,4 @@ if [ "$*" = 'supervisord -c /etc/supervisor/conf.d/supervisord.conf' ]; then
echo "Starting supervisord..."
fi
exec "$@"
exec "$@"

View File

@@ -5,9 +5,6 @@ logfile=/dev/null
logfile_maxbytes=0
pidfile=/var/run/supervisord.pid
[rpcinterface:supervisor]
supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
[program:php-fpm]
command=/usr/local/sbin/php-fpm -F
autostart=true