From 964b8e5d6365582bb6fbbe12edb910c8029d0a03 Mon Sep 17 00:00:00 2001
From: Pierre Jaury <pierre@jaury.eu>
Date: Sat, 16 Jun 2018 09:50:38 +0200
Subject: [PATCH] Handle storage folder creation properly

---
 docker/Dockerfile.apache | 8 +++++---
 docker/start.sh          | 8 +++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/Dockerfile.apache b/docker/Dockerfile.apache
index 8450d7792..9839ad303 100644
--- a/docker/Dockerfile.apache
+++ b/docker/Dockerfile.apache
@@ -5,7 +5,7 @@ ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends libmagickwand-dev git \
- && docker-php-ext-install pdo_mysql pcntl \
+ && docker-php-ext-install pdo_mysql pcntl gd \
  && pecl install imagick \
  && docker-php-ext-enable imagick pcntl imagick \
  && a2enmod rewrite \
@@ -15,6 +15,8 @@ RUN apt-get update \
  && ln -sf /usr/bin/composer.phar /usr/bin/composer \
  && rm /tmp/composer.phar
 
+ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
+
 COPY . /var/www/
 
 WORKDIR /var/www/
@@ -25,11 +27,11 @@ RUN install -d -m0755 -o www-data -g www-data \
     /var/www/storage/framework/sessions \
     /var/www/storage/framework/views \
     /var/www/storage/framework/cache \
+ && cp -r storage storage.skel \
+ && cp docker/env .env \
  && composer install --prefer-source --no-interaction \
  && rm -rf html && ln -s public html
 
 VOLUME ["/var/www/storage"]
 
-ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
-
 CMD /var/www/docker/start.sh
diff --git a/docker/start.sh b/docker/start.sh
index 962bcb6f7..5925d3f28 100755
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -1,8 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-mkdir -p storage/app/public/avatars
-mkdir -p storage/{debugbar,logs}
-mkdir -p storage/framework/{cache,sessions,views,testing}
-php artisan migrate
+cp -r storage.skel/* storage/
+php artisan migrate --force
 
 exec apache2-foreground