Merge pull request #942 from uselagoon/add_php_exif

feat: add exif extension to php images
uselagoon · Feb 26, 2024 · 18eda69 · 18eda69
2 parents b2ca1bd + a078af4
commit 18eda69
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git 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.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
@@ -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"
@@ -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
@@ -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/*