From 257cfb30bb15ad9766437be474f090e71296dae7 Mon Sep 17 00:00:00 2001 From: gdarko Date: Sun, 28 Jan 2024 17:52:10 -0600 Subject: [PATCH] Update docker images --- Dockerfile | 3 ++- docker-compose.yml | 2 +- docker-compose/cron.dockerfile | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 581d0411..2df8e43b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1-fpm +FROM php:8.1-fpm-bookworm # Arguments defined in docker-compose.yml ARG user @@ -8,6 +8,7 @@ ARG uid RUN apt-get update && apt-get install -y \ git \ curl \ + nano \ libpng-dev \ libonig-dev \ libxml2-dev \ diff --git a/docker-compose.yml b/docker-compose.yml index 54e6f35c..0790656c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: - invoiceshelf db: - image: mariadb + image: mariadb:10.11 restart: always volumes: - db:/var/lib/mysql diff --git a/docker-compose/cron.dockerfile b/docker-compose/cron.dockerfile index 38598c00..4e76af25 100644 --- a/docker-compose/cron.dockerfile +++ b/docker-compose/cron.dockerfile @@ -1,10 +1,10 @@ -FROM php:8.0-fpm-alpine +FROM php:8.1-fpm-bookworm -RUN apk add --no-cache \ - php8-bcmath +RUN apt update && apt install -y cron RUN docker-php-ext-install pdo pdo_mysql bcmath COPY docker-compose/crontab /etc/crontabs/root +RUN crontab /etc/crontabs/root -CMD ["crond", "-f"] +CMD ["/usr/sbin/cron", "-f"]