From 583abdf37a1718725860eccd5c07f5a0729b8cda Mon Sep 17 00:00:00 2001
From: Pierre Jaury <pierre@jaury.eu>
Date: Sat, 16 Jun 2018 22:27:45 +0200
Subject: [PATCH] Include missing dependencies for image optimization, slim the
 image and run horizon

---
 docker/Dockerfile.apache | 29 ++++++++++++++++-------------
 docker/env               | 11 ++++++++++-
 docker/start.sh          |  3 +++
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/docker/Dockerfile.apache b/docker/Dockerfile.apache
index 16f80aa6d..ce9afc73b 100644
--- a/docker/Dockerfile.apache
+++ b/docker/Dockerfile.apache
@@ -4,31 +4,34 @@ ARG COMPOSER_VERSION="1.6.5"
 ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434"
 
 RUN apt-get update \
- && apt-get install -y --no-install-recommends libmagickwand-dev git \
-      libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev \
- && docker-php-ext-install pdo_mysql pcntl gd \
- && pecl install imagick \
+ && apt-get install -y --no-install-recommends git \
+      optipng pngquant jpegoptim gifsicle \
+      libfreetype6 libjpeg62-turbo libpng16-16 libxpm4 libvpx4 libmagickwand-6.q16-3 \
+      libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \
+ && docker-php-source extract \
  && docker-php-ext-configure gd \
       --with-freetype-dir=/usr/lib/x86_64-linux-gnu/ \
       --with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \
       --with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \
       --with-vpx-dir=/usr/lib/x86_64-linux-gnu/ \
- && docker-php-ext-enable imagick pcntl imagick \
+ && docker-php-ext-install pdo_mysql pcntl gd exif \
+ && pecl install imagick \
+ && docker-php-ext-enable imagick pcntl imagick gd exif \
  && a2enmod rewrite \
- && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /tmp/composer.phar \
- && echo "${COMPOSER_CHECKSUM}  /tmp/composer.phar" | sha256sum -c - \
- && install -m0755 -o root -g root /tmp/composer.phar /usr/bin/composer.phar \
- && ln -sf /usr/bin/composer.phar /usr/bin/composer \
- && rm /tmp/composer.phar
+ && curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer \
+ && echo "${COMPOSER_CHECKSUM}  /usr/bin/composer" | sha256sum -c - \
+ && chmod 755 /usr/bin/composer \
+ && apt-get autoremove --purge -y \
+       libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev \
+ && rm -rf /var/cache/apt \
+ && docker-php-source delete
 
 ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
 
 COPY . /var/www/
 
 WORKDIR /var/www/
-RUN find storage -name .gitignore -exec rm {} + \
- && chown -R www-data:www-data /var/www/storage \
- && cp -r storage storage.skel \
+RUN cp -r storage storage.skel \
  && cp docker/env .env \
  && composer install --prefer-source --no-interaction \
  && rm -rf html && ln -s public html
diff --git a/docker/env b/docker/env
index 03a4edb9f..0f2f9c597 100644
--- a/docker/env
+++ b/docker/env
@@ -40,7 +40,16 @@ SESSION_SECURE_COOKIE=true
 API_BASE="/api/1/"
 API_SEARCH="/api/search"
 
-OPEN_REGISTRATION=true
+OPEN_REGISTRATION=${OPEN_REGISTRATION}
+MAX_CAPTION_LENGTH=${MAX_CAPTION_LENGTH}
+MAX_PHOTO_SIZE=${MAX_PHOTO_SIZE}
+ENFORCE_EMAIL_VERIFICATION=${ENFORCE_EMAIL_VERIFICATION}
+REMOTE_FOLLOW=${REMOTE_FOLLOW}
+ACTIVITY_PUB=${ACTIVITY_PUB}
+
+RECAPTCHA_ENABLED=${RECAPTCHA_ENABLED}
+RECAPTCHA_PUBLIC_KEY=${RECAPTCHA_PUBLIC_KEY}
+RECAPTCHA_PRIVATE_KEY=${RECAPTCHA_PRIVATE_KEY}
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
diff --git a/docker/start.sh b/docker/start.sh
index 5925d3f28..e716d8ee0 100755
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 cp -r storage.skel/* storage/
+chown -R www-data:www-data storage/
 php artisan migrate --force
+php artisan storage:link
 
+php artisan horizon &
 exec apache2-foreground