TypeScript: Updated compile target, addressed issues

[bookstack] / dev / docker / Dockerfile

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 5040298e05271e89fd4cea23c53a48313ee48276..edab90ca1c5e9ad1ad126dcb217700844eb230ee 100644 (file)
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -6,15 +6,18 @@ RUN apt-get update && \
         git \
         zip \
         unzip \
         git \
         zip \
         unzip \

-        libpng-dev \
+        libfreetype-dev \
+        libjpeg62-turbo-dev \

         libldap2-dev \
         libldap2-dev \

+        libpng-dev \

         libzip-dev \
         wait-for-it && \
     rm -rf /var/lib/apt/lists/*
 
 # Install PHP extensions
 RUN docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" && \
         libzip-dev \
         wait-for-it && \
     rm -rf /var/lib/apt/lists/*
 
 # Install PHP extensions
 RUN docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" && \

-    docker-php-ext-install pdo_mysql gd ldap zip && \
+    docker-php-ext-configure gd --with-freetype --with-jpeg && \
+    docker-php-ext-install -j$(nproc) pdo_mysql gd ldap zip && \

     pecl install xdebug && \
     docker-php-ext-enable xdebug
 
     pecl install xdebug && \
     docker-php-ext-enable xdebug
 


@@ -30,5 +33,6 @@ RUN a2enmod rewrite && \
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
     sed -i 's/memory_limit = 128M/memory_limit = 512M/g' "$PHP_INI_DIR/php.ini"
 
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
     sed -i 's/memory_limit = 128M/memory_limit = 512M/g' "$PHP_INI_DIR/php.ini"
 

-ENV APACHE_DOCUMENT_ROOT /app/public
+ENV APACHE_DOCUMENT_ROOT="/app/public"
+

 WORKDIR /app
 WORKDIR /app