From 0dd714aae69dd103e72ae519d4638b71da7c5e4f Mon Sep 17 00:00:00 2001 From: Benedikt Neumayr <30441325+benediktneumayr@users.noreply.github.com> Date: Sun, 31 Oct 2021 02:25:31 +0200 Subject: [PATCH] Added php intl extension and dependencies (#129) * Added php intl extension and dependencies --- 4.0/php7.4/apache/Dockerfile | 2 ++ 4.0/php7.4/fpm-alpine/Dockerfile | 2 ++ 4.0/php7.4/fpm/Dockerfile | 2 ++ 4.0/php8.0/apache/Dockerfile | 2 ++ 4.0/php8.0/fpm-alpine/Dockerfile | 2 ++ 4.0/php8.0/fpm/Dockerfile | 2 ++ Dockerfile.template | 12 ++++++++++++ 7 files changed, 24 insertions(+) diff --git a/4.0/php7.4/apache/Dockerfile b/4.0/php7.4/apache/Dockerfile index 6a3b7f8..ebbe066 100644 --- a/4.0/php7.4/apache/Dockerfile +++ b/4.0/php7.4/apache/Dockerfile @@ -21,6 +21,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ libbz2-dev \ libgmp-dev \ + libicu-dev \ libjpeg-dev \ libldap2-dev \ libmcrypt-dev \ @@ -37,6 +38,7 @@ RUN set -ex; \ bz2 \ gd \ gmp \ + intl \ ldap \ mysqli \ pdo_mysql \ diff --git a/4.0/php7.4/fpm-alpine/Dockerfile b/4.0/php7.4/fpm-alpine/Dockerfile index 356ee08..1ccc84b 100644 --- a/4.0/php7.4/fpm-alpine/Dockerfile +++ b/4.0/php7.4/fpm-alpine/Dockerfile @@ -21,6 +21,7 @@ RUN set -ex; \ autoconf \ bzip2-dev \ gmp-dev \ + icu-dev \ libjpeg-turbo-dev \ libmcrypt-dev \ libmemcached-dev \ @@ -37,6 +38,7 @@ RUN set -ex; \ bz2 \ gd \ gmp \ + intl \ ldap \ mysqli \ pdo_mysql \ diff --git a/4.0/php7.4/fpm/Dockerfile b/4.0/php7.4/fpm/Dockerfile index 64bdb3f..1ebf8f6 100644 --- a/4.0/php7.4/fpm/Dockerfile +++ b/4.0/php7.4/fpm/Dockerfile @@ -19,6 +19,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ libbz2-dev \ libgmp-dev \ + libicu-dev \ libjpeg-dev \ libldap2-dev \ libmcrypt-dev \ @@ -35,6 +36,7 @@ RUN set -ex; \ bz2 \ gd \ gmp \ + intl \ ldap \ mysqli \ pdo_mysql \ diff --git a/4.0/php8.0/apache/Dockerfile b/4.0/php8.0/apache/Dockerfile index 6030c71..68f7eb0 100644 --- a/4.0/php8.0/apache/Dockerfile +++ b/4.0/php8.0/apache/Dockerfile @@ -21,6 +21,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ libbz2-dev \ libgmp-dev \ + libicu-dev \ libjpeg-dev \ libldap2-dev \ libmcrypt-dev \ @@ -37,6 +38,7 @@ RUN set -ex; \ bz2 \ gd \ gmp \ + intl \ ldap \ mysqli \ pdo_mysql \ diff --git a/4.0/php8.0/fpm-alpine/Dockerfile b/4.0/php8.0/fpm-alpine/Dockerfile index 836ff49..ad05b7f 100644 --- a/4.0/php8.0/fpm-alpine/Dockerfile +++ b/4.0/php8.0/fpm-alpine/Dockerfile @@ -21,6 +21,7 @@ RUN set -ex; \ autoconf \ bzip2-dev \ gmp-dev \ + icu-dev \ libjpeg-turbo-dev \ libmcrypt-dev \ libmemcached-dev \ @@ -37,6 +38,7 @@ RUN set -ex; \ bz2 \ gd \ gmp \ + intl \ ldap \ mysqli \ pdo_mysql \ diff --git a/4.0/php8.0/fpm/Dockerfile b/4.0/php8.0/fpm/Dockerfile index 2252364..1330b02 100644 --- a/4.0/php8.0/fpm/Dockerfile +++ b/4.0/php8.0/fpm/Dockerfile @@ -19,6 +19,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ libbz2-dev \ libgmp-dev \ + libicu-dev \ libjpeg-dev \ libldap2-dev \ libmcrypt-dev \ @@ -35,6 +36,7 @@ RUN set -ex; \ bz2 \ gd \ gmp \ + intl \ ldap \ mysqli \ pdo_mysql \ diff --git a/Dockerfile.template b/Dockerfile.template index 9d5c70c..3e35e97 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -26,6 +26,9 @@ RUN set -ex; \ autoconf \ bzip2-dev \ gmp-dev \ +{{ if env.version == "4.0" then ( -}} + icu-dev \ +{{ ) else "" end -}} libjpeg-turbo-dev \ libmcrypt-dev \ libmemcached-dev \ @@ -46,6 +49,9 @@ RUN set -ex; \ bz2 \ gd \ gmp \ +{{ if env.version == "4.0" then ( -}} + intl \ +{{ ) else "" end -}} ldap \ mysqli \ pdo_mysql \ @@ -84,6 +90,9 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ libbz2-dev \ libgmp-dev \ +{{ if env.version == "4.0" then ( -}} + libicu-dev \ +{{ ) else "" end -}} libjpeg-dev \ libldap2-dev \ libmcrypt-dev \ @@ -104,6 +113,9 @@ RUN set -ex; \ bz2 \ gd \ gmp \ +{{ if env.version == "4.0" then ( -}} + intl \ +{{ ) else "" end -}} ldap \ mysqli \ pdo_mysql \