From 89b027755026669a38946dac4c89c8cb71b36485 Mon Sep 17 00:00:00 2001 From: Michael Ackerman <25309928+kittysnacks@users.noreply.github.com> Date: Wed, 8 Jan 2025 14:32:53 -0800 Subject: [PATCH 1/2] Add more extensions for pandoc. --- docker/Dockerfile-pandoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile-pandoc b/docker/Dockerfile-pandoc index fc7bfab..a9b02b9 100644 --- a/docker/Dockerfile-pandoc +++ b/docker/Dockerfile-pandoc @@ -5,7 +5,6 @@ RUN apt-get update \ pandoc \ jq \ awscli \ - libpng-dev \ && apt-get clean COPY --chown=www-data:www-data pandoc/* /var/www/html/ @@ -17,7 +16,10 @@ RUN mkdir \ /var/www/datatmp \ /var/www/html/imgs -RUN docker-php-ext-install gd +# Install PHP extensions: gd +RUN apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ + && docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \ + && docker-php-ext-install gd # enable php production defaults RUN cp $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini From e35492e4a40542a054614cd8b2c9e1046cb288af Mon Sep 17 00:00:00 2001 From: Michael Ackerman <25309928+kittysnacks@users.noreply.github.com> Date: Wed, 8 Jan 2025 17:15:35 -0800 Subject: [PATCH 2/2] Try PHP 8.1 in pandoc container. --- docker/Dockerfile-pandoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-pandoc b/docker/Dockerfile-pandoc index a9b02b9..c4e8434 100644 --- a/docker/Dockerfile-pandoc +++ b/docker/Dockerfile-pandoc @@ -1,4 +1,4 @@ -FROM php:8.3-apache +FROM php:8.1-apache RUN apt-get update \ && apt-get install -y --no-install-recommends --no-install-suggests \