From: Dan Brown Date: Thu, 14 Jul 2022 00:34:57 +0000 (+0100) Subject: Tweaked docker dev container to work with m1 apple silicon X-Git-Tag: v22.07~1^2~26^2 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/refs/pull/3573/head Tweaked docker dev container to work with m1 apple silicon Tested on m1 macbook, needs testing on amd64 --- diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile index 615eb2b2a..349e315d2 100644 --- 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 \