diff options
| author | Tilo Spannagel <development@tilosp.de> | 2017-06-29 12:57:59 +0200 |
|---|---|---|
| committer | Tilo Spannagel <development@tilosp.de> | 2017-06-29 16:29:52 +0200 |
| commit | 0bd790309e71d629a2cd5f21feb096557b1ca087 (patch) | |
| tree | febe1e122b1378288ba9d5e120187b75af787a7d /12.0 | |
| parent | 820f21cdf219a0c23ed282de2f5e982503eb1b42 (diff) | |
Use debMultiarch as libdir
Diffstat (limited to '12.0')
| -rw-r--r-- | 12.0/apache/Dockerfile | 5 | ||||
| -rw-r--r-- | 12.0/fpm/Dockerfile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile index 4bcc5f03..1b05272b 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 d69e770e..41b7365f 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 |