Merge pull request #3573 from BookStackApp/m1_docker_support

M1/Apple Silicon dev docker compatibility

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 615eb2b2a863193a26bbdc0cf704a8054a806376..349e315d2e3e98eed79ef08e9c3fc0e83d10e980 100644 (file)
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /app
 # Install additional dependacnies and configure apache
 RUN apt-get update -y \
     && apt-get install -y git zip unzip libpng-dev libldap2-dev libzip-dev wait-for-it \
-    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
+    && docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" \
     && docker-php-ext-install pdo_mysql gd ldap zip \
     && pecl install xdebug \
     && docker-php-ext-enable xdebug \