Merge pull request #1 from ArmandoAssuncao/feat/v0.29.3

updated bookstack to 0.29.3

Dockerfile

@@ -1,19 +1,18 @@
-FROM php:7.1-apache-stretch
+FROM php:7.2-apache-stretch
 
 ENV BOOKSTACK=BookStack \
-    BOOKSTACK_VERSION=0.27.5 \
+    BOOKSTACK_VERSION=0.29.3 \
     BOOKSTACK_HOME="/var/www/bookstack"
 
-RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng-dev wget libldap2-dev libtidy-dev \
-   && apt-get install -y --no-install-recommends apt-utils \
-   && docker-php-ext-install pdo pdo_mysql mbstring zip tidy \
-   && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+RUN apt-get update && apt-get install -y --no-install-recommends git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng-dev wget libldap2-dev libtidy-dev libxml2-dev fontconfig ttf-freefont wkhtmltopdf tar curl \
+   && docker-php-ext-install dom pdo pdo_mysql zip tidy  \
+   && docker-php-ext-configure ldap \
    && docker-php-ext-install ldap \
    && docker-php-ext-configure gd --with-freetype-dir=usr/include/ --with-jpeg-dir=/usr/include/ \
    && docker-php-ext-install gd \
    && cd /var/www && curl -sS https://getcomposer.org/installer | php \
    && mv /var/www/composer.phar /usr/local/bin/composer \
-   && wget https://github.com/ssddanbrown/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \
+   && wget https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \
    && tar -xf ${BOOKSTACK}.tar.gz && mv BookStack-${BOOKSTACK_VERSION} ${BOOKSTACK_HOME} && rm ${BOOKSTACK}.tar.gz  \
    && cd $BOOKSTACK_HOME && composer install \
    && chown -R www-data:www-data $BOOKSTACK_HOME \
@@ -23,17 +22,18 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg
 
 COPY php.ini /usr/local/etc/php/php.ini
 COPY bookstack.conf /etc/apache2/sites-enabled/bookstack.conf
+
 RUN a2enmod rewrite
 
-COPY dokku-entrypoint.sh /
+COPY dokku-entrypoint.sh /bin/dokku-entrypoint.sh
 
 WORKDIR $BOOKSTACK_HOME
 
 EXPOSE 80
 
-VOLUME ["$BOOKSTACK_HOME/public/uploads","$BOOKSTACK_HOME/public/storage"]
+VOLUME ["$BOOKSTACK_HOME/public/uploads","$BOOKSTACK_HOME/storage/uploads"]
 
-ENTRYPOINT ["/dokku-entrypoint.sh"]
+ENTRYPOINT ["/bin/dokku-entrypoint.sh"]
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -42,7 +42,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.license="MIT" \
       org.label-schema.name="bookstack" \
       org.label-schema.vendor="solidnerd" \
-      org.label-schema.url="https://github.com/solidnerd/docker-bookstack/" \
+      org.label-schema.url="https://github.com/ArmandoAssuncao/dokku-bookstack/" \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/solidnerd/docker-bookstack.git" \
+      org.label-schema.vcs-url="https://github.com/ArmandoAssuncao/dokku-bookstack.git" \
       org.label-schema.vcs-type="Git"

VERSION

@@ -1 +1 @@
-0.27.5
+0.29.3