From: Dan Brown <redacted>
Date: Sat, 20 Mar 2021 16:44:47 +0000 (+0000)
Subject: Updated dev-docker setup
X-Git-Tag: v21.04~1^2~11^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c548c060864750ac6620c85c3de4732413910754?ds=inline;hp=-c

Updated dev-docker setup

Removed extension installs for already installed things.
Removed tidy build bits.
Ensured it ran via quick build and test
---

c548c060864750ac6620c85c3de4732413910754
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 059179d3b..b55ec9e0a 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -4,9 +4,9 @@ ENV APACHE_DOCUMENT_ROOT /app/public
 WORKDIR /app
 
 RUN apt-get update -y \
-    && apt-get install -y git zip unzip libtidy-dev libpng-dev libldap2-dev libxml++2.6-dev wait-for-it \
+    && apt-get install -y git zip unzip libpng-dev libldap2-dev wait-for-it \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
-    && docker-php-ext-install pdo pdo_mysql dom xml mbstring gd ldap \
+    && docker-php-ext-install pdo_mysql gd ldap \
     && a2enmod rewrite \
     && sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \
     && sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf \