From 0bd790309e71d629a2cd5f21feb096557b1ca087 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 29 Jun 2017 12:57:59 +0200 Subject: [PATCH] Use debMultiarch as libdir --- 10.0/apache/Dockerfile | 5 +++-- 10.0/fpm/Dockerfile | 5 +++-- 11.0/apache/Dockerfile | 5 +++-- 11.0/fpm/Dockerfile | 5 +++-- 12.0/apache/Dockerfile | 5 +++-- 12.0/fpm/Dockerfile | 5 +++-- Dockerfile-php7.template | 5 +++-- Dockerfile.template | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/10.0/apache/Dockerfile b/10.0/apache/Dockerfile index 570aef6..d8b1597 100644 --- a/10.0/apache/Dockerfile +++ b/10.0/apache/Dockerfile @@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html -RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ +RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \ && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip # set recommended PHP.ini settings diff --git a/10.0/fpm/Dockerfile b/10.0/fpm/Dockerfile index b60b57f..b160a46 100644 --- a/10.0/fpm/Dockerfile +++ b/10.0/fpm/Dockerfile @@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html -RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ +RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \ && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip # set recommended PHP.ini settings diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile index 71978ad..d4c0ff5 100644 --- a/11.0/apache/Dockerfile +++ b/11.0/apache/Dockerfile @@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html -RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ +RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \ && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip # set recommended PHP.ini settings diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile index 78890a3..9aa10e0 100644 --- a/11.0/fpm/Dockerfile +++ b/11.0/fpm/Dockerfile @@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html -RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ +RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \ && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip # set recommended PHP.ini settings diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index 4bcc5f0..1b05272 100644 --- a/12.0/apache/Dockerfile +++ b/12.0/apache/Dockerfile @@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html -RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ +RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \ && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip # set recommended PHP.ini settings diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile index d69e770..41b7365 100644 --- a/12.0/fpm/Dockerfile +++ b/12.0/fpm/Dockerfile @@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html -RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ +RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \ && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip # set recommended PHP.ini settings diff --git a/Dockerfile-php7.template b/Dockerfile-php7.template index 203ba66..ef49df7 100644 --- a/Dockerfile-php7.template +++ b/Dockerfile-php7.template @@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html -RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ +RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \ && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip # set recommended PHP.ini settings diff --git a/Dockerfile.template b/Dockerfile.template index 14cf362..581e912 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -16,8 +16,9 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # https://docs.nextcloud.com/server/9/admin_manual/installation/source_installation.html -RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \ +RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch" \ && docker-php-ext-install gd exif intl mbstring mcrypt ldap mysql opcache pdo_mysql pdo_pgsql pgsql zip # set recommended PHP.ini settings