diff --git a/Dockerfile.apache b/docker/Dockerfile.apache
similarity index 97%
rename from Dockerfile.apache
rename to docker/Dockerfile.apache
index bc26b7e54..8450d7792 100644
--- a/Dockerfile.apache
+++ b/docker/Dockerfile.apache
@@ -31,3 +31,5 @@ RUN install -d -m0755 -o www-data -g www-data \
 VOLUME ["/var/www/storage"]
 
 ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
+
+CMD /var/www/docker/start.sh
diff --git a/Dockerfile b/docker/Dockerfile.fpm
similarity index 100%
rename from Dockerfile
rename to docker/Dockerfile.fpm
diff --git a/docker/start.sh b/docker/start.sh
new file mode 100755
index 000000000..bbf6327be
--- /dev/null
+++ b/docker/start.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mkdir -p storage/framework/{cache,sessions,views,logs}
+php artisan migrate
+
+exec apache2-foreground