From e031d7c34ef8e4d2d7db1651d8c1be010358042d Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Wed, 8 Jan 2025 12:51:28 -0600 Subject: [PATCH] Drupal's implementation needs imagemagick binaries (#156) * remove redundant openssl install * Drupal's implementation needs imagemagick bins --------- Co-authored-by: Alec Reynolds --- images/7.4-apache/Dockerfile | 1 + images/7.4-fpm/Dockerfile | 1 + images/8.0-apache/Dockerfile | 1 + images/8.0-fpm/Dockerfile | 1 + images/8.1-apache/Dockerfile | 1 + images/8.1-fpm/Dockerfile | 1 + images/8.2-apache/Dockerfile | 1 + images/8.2-fpm/Dockerfile | 1 + images/8.3-apache/Dockerfile | 2 +- images/8.3-fpm/Dockerfile | 2 +- images/8.4-apache/Dockerfile | 2 +- images/8.4-fpm/Dockerfile | 2 +- 12 files changed, 12 insertions(+), 4 deletions(-) diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile index d6e28ad..47b27f4 100644 --- a/images/7.4-apache/Dockerfile +++ b/images/7.4-apache/Dockerfile @@ -16,6 +16,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ exiftool \ git-core \ gnupg2 \ + imagemagick \ libonig-dev \ mariadb-client \ openssl \ diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile index b8f9b7d..7a6d281 100644 --- a/images/7.4-fpm/Dockerfile +++ b/images/7.4-fpm/Dockerfile @@ -16,6 +16,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ exiftool \ git-core \ gnupg2 \ + imagemagick \ libonig-dev \ mariadb-client \ openssl \ diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile index 16982d9..32368e3 100644 --- a/images/8.0-apache/Dockerfile +++ b/images/8.0-apache/Dockerfile @@ -16,6 +16,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ exiftool \ git-core \ gnupg2 \ + imagemagick \ libonig-dev \ mariadb-client \ openssl \ diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile index 60e348a..63456c9 100644 --- a/images/8.0-fpm/Dockerfile +++ b/images/8.0-fpm/Dockerfile @@ -16,6 +16,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ exiftool \ git-core \ gnupg2 \ + imagemagick \ libonig-dev \ mariadb-client \ openssl \ diff --git a/images/8.1-apache/Dockerfile b/images/8.1-apache/Dockerfile index f8b79c6..ff0108b 100644 --- a/images/8.1-apache/Dockerfile +++ b/images/8.1-apache/Dockerfile @@ -17,6 +17,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ + imagemagick \ mariadb-client \ openssl \ postgresql-client-15 \ diff --git a/images/8.1-fpm/Dockerfile b/images/8.1-fpm/Dockerfile index 4f60dd2..b420667 100644 --- a/images/8.1-fpm/Dockerfile +++ b/images/8.1-fpm/Dockerfile @@ -17,6 +17,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ + imagemagick \ mariadb-client \ openssl \ postgresql-client-15 \ diff --git a/images/8.2-apache/Dockerfile b/images/8.2-apache/Dockerfile index 014f986..6d5a0cb 100644 --- a/images/8.2-apache/Dockerfile +++ b/images/8.2-apache/Dockerfile @@ -17,6 +17,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ + imagemagick \ mariadb-client \ openssl \ postgresql-client-15 \ diff --git a/images/8.2-fpm/Dockerfile b/images/8.2-fpm/Dockerfile index ff83f30..2258c8c 100644 --- a/images/8.2-fpm/Dockerfile +++ b/images/8.2-fpm/Dockerfile @@ -17,6 +17,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ + imagemagick \ mariadb-client \ openssl \ postgresql-client-15 \ diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile index ab5e765..80e5b35 100644 --- a/images/8.3-apache/Dockerfile +++ b/images/8.3-apache/Dockerfile @@ -26,7 +26,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ - openssl \ + imagemagick \ postgresql-client-15 \ pv \ rsync \ diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile index f0fd1b0..de452ee 100644 --- a/images/8.3-fpm/Dockerfile +++ b/images/8.3-fpm/Dockerfile @@ -26,8 +26,8 @@ RUN \ exiftool \ git-core \ gnupg2 \ + imagemagick \ mariadb-client \ - openssl \ postgresql-client-15 \ pv \ rsync \ diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile index c4cec88..3f7ceab 100644 --- a/images/8.4-apache/Dockerfile +++ b/images/8.4-apache/Dockerfile @@ -26,9 +26,9 @@ RUN \ exiftool \ git-core \ gnupg2 \ + imagemagick \ mariadb-client \ mariadb-client-compat \ - openssl \ postgresql-client-15 \ pv \ rsync \ diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index c9df85b..0ccb700 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -27,9 +27,9 @@ RUN \ exiftool \ git-core \ gnupg2 \ + imagemagick \ mariadb-client \ mariadb-client-compat \ - openssl \ postgresql-client-15 \ pv \ rsync \