friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2024-05-23 09:04:58 +02:00
Code Issues Releases Wiki Activity

Add multiarch support for ldap lib

Browse source
This commit is contained in:
Philipp Holzer 2019-11-16 12:28:49 +01:00
parent 687136d26b
commit 3e02375c58
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
8 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
2019.09/apache/Dockerfile
View file

@ -36,6 +36,9 @@ RUN set -ex; \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -43,8 +46,8 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \ --with-libdir=lib/$debMultiarch/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \

6
2019.09/fpm-alpine/Dockerfile
View file

@ -28,7 +28,8 @@ RUN set -ex; \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
libldap2-dev \ icu-dev \
openldap-dev \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -38,9 +39,6 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \

7
2019.09/fpm/Dockerfile
View file

@ -36,6 +36,9 @@ RUN set -ex; \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -43,8 +46,8 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \ --with-libdir=lib/$debMultiarch/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \

7
2019.12-dev/apache/Dockerfile
View file

@ -36,6 +36,9 @@ RUN set -ex; \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -43,8 +46,8 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \ --with-libdir=lib/$debMultiarch/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \

6
2019.12-dev/fpm-alpine/Dockerfile
View file

@ -28,7 +28,8 @@ RUN set -ex; \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
libldap2-dev \ icu-dev \
openldap-dev \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -38,9 +39,6 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \

7
2019.12-dev/fpm/Dockerfile
View file

@ -36,6 +36,9 @@ RUN set -ex; \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -43,8 +46,8 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \ --with-libdir=lib/$debMultiarch/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \

6
Dockerfile-alpine.template
View file

@ -27,7 +27,8 @@ RUN set -ex; \
librsvg \ librsvg \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
libldap2-dev \ icu-dev \
openldap-dev \
; \ ; \
\ \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -37,9 +38,6 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
\ \
docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \
; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \

7
Dockerfile-debian.template
View file

@ -35,6 +35,9 @@ RUN set -ex; \
libzip-dev \ libzip-dev \
libldap2-dev \ libldap2-dev \
; \ ; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \ docker-php-ext-configure gd \
--with-gd \ --with-gd \
--with-freetype-dir=/usr/include/ \ --with-freetype-dir=/usr/include/ \
@ -42,8 +45,8 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-configure ldap \ docker-php-ext-configure ldap \
--with-libdir=lib/x86_64-linux-gnu/ \ --with-libdir=lib/$debMultiarch/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
pdo_mysql \ pdo_mysql \
gd \ gd \