From 0bcaaf1af2745bd27fa94a405233e6c1cbe80d82 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Thu, 22 Feb 2024 09:26:55 +1100 Subject: [PATCH 1/2] feat: add exif to php images --- images/php-fpm/8.1.Dockerfile | 5 ++++- images/php-fpm/8.2.Dockerfile | 5 ++++- images/php-fpm/8.3.Dockerfile | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/images/php-fpm/8.1.Dockerfile b/images/php-fpm/8.1.Dockerfile index f54bdfa0b..ad32174a7 100644 --- a/images/php-fpm/8.1.Dockerfile +++ b/images/php-fpm/8.1.Dockerfile @@ -86,11 +86,13 @@ RUN apk update \ .phpize-deps \ && sed -i '1s/^/;Intentionally disabled. Enable via setting env variable XDEBUG_ENABLE to true\n;/' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && docker-php-ext-configure gd --with-webp --with-jpeg --with-freetype \ - && docker-php-ext-install -j4 bcmath gd gettext intl mysqli pdo_mysql opcache pdo_pgsql pgsql shmop soap sockets tidy xsl zip \ + && docker-php-ext-install -j4 bcmath exif gd gettext intl mysqli pdo_mysql opcache pdo_pgsql pgsql shmop soap sockets tidy xsl zip \ && apk del -r \ .devdeps \ && apk add --no-cache \ + acl \ fcgi \ + file \ gettext \ icu-libs \ imagemagick \ @@ -106,6 +108,7 @@ RUN apk update \ postgresql-libs \ ssmtp \ tidyhtml \ + unzip \ yaml \ && rm -rf /var/cache/apk/* diff --git a/images/php-fpm/8.2.Dockerfile b/images/php-fpm/8.2.Dockerfile index 904279020..140b534d2 100644 --- a/images/php-fpm/8.2.Dockerfile +++ b/images/php-fpm/8.2.Dockerfile @@ -85,11 +85,13 @@ RUN apk update \ .phpize-deps \ && sed -i '1s/^/;Intentionally disabled. Enable via setting env variable XDEBUG_ENABLE to true\n;/' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && docker-php-ext-configure gd --with-webp --with-jpeg --with-freetype \ - && docker-php-ext-install -j4 bcmath gd gettext intl mysqli pdo_mysql opcache pdo_pgsql pgsql shmop soap sockets tidy xsl zip \ + && docker-php-ext-install -j4 bcmath exif gd gettext intl mysqli pdo_mysql opcache pdo_pgsql pgsql shmop soap sockets tidy xsl zip \ && apk del -r \ .devdeps \ && apk add --no-cache \ + acl \ fcgi \ + file \ gettext \ icu-libs \ imagemagick \ @@ -105,6 +107,7 @@ RUN apk update \ postgresql-libs \ ssmtp \ tidyhtml \ + unzip \ yaml \ && rm -rf /var/cache/apk/* diff --git a/images/php-fpm/8.3.Dockerfile b/images/php-fpm/8.3.Dockerfile index 277852bad..7fa7c46e1 100644 --- a/images/php-fpm/8.3.Dockerfile +++ b/images/php-fpm/8.3.Dockerfile @@ -94,11 +94,13 @@ RUN apk update \ .phpize-deps \ && sed -i '1s/^/;Intentionally disabled. Enable via setting env variable XDEBUG_ENABLE to true\n;/' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \ && docker-php-ext-configure gd --with-webp --with-jpeg --with-freetype \ - && docker-php-ext-install -j4 bcmath gd gettext intl mysqli pdo_mysql opcache pdo_pgsql pgsql shmop soap sockets tidy xsl zip \ + && docker-php-ext-install -j4 bcmath exif gd gettext intl mysqli pdo_mysql opcache pdo_pgsql pgsql shmop soap sockets tidy xsl zip \ && apk del -r \ .devdeps \ && apk add --no-cache \ + acl \ fcgi \ + file \ gettext \ icu-libs \ imagemagick \ @@ -114,6 +116,7 @@ RUN apk update \ postgresql-libs \ ssmtp \ tidyhtml \ + unzip \ yaml \ && rm -rf /var/cache/apk/* From a078af42d4769cd57be27461adef21884bd03c17 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 26 Feb 2024 11:38:06 +1100 Subject: [PATCH 2/2] chore: downgrade to php:8.2.16-fpm-alpine3.18 --- images/php-cli/8.2.Dockerfile | 2 +- images/php-fpm/8.2.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/php-cli/8.2.Dockerfile b/images/php-cli/8.2.Dockerfile index ce55862f4..ce6f08660 100644 --- a/images/php-cli/8.2.Dockerfile +++ b/images/php-cli/8.2.Dockerfile @@ -15,7 +15,7 @@ RUN apk update \ mariadb-client \ mariadb-connector-c \ mongodb-tools \ - nodejs=~20 \ + nodejs-current=~20 \ npm \ openssh-client \ openssh-sftp-server \ diff --git a/images/php-fpm/8.2.Dockerfile b/images/php-fpm/8.2.Dockerfile index 140b534d2..04db8bddd 100644 --- a/images/php-fpm/8.2.Dockerfile +++ b/images/php-fpm/8.2.Dockerfile @@ -5,7 +5,7 @@ FROM composer:latest as healthcheckbuilder RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6 -FROM php:8.2.16-fpm-alpine3.19 +FROM php:8.2.16-fpm-alpine3.18 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"