Merge pull request #4 from admturner/code-quality/structure

Code quality/structure

.gitignore

@@ -10,7 +10,7 @@
 .env
 
 # Ignore the built config files.
-config/wordpress/Dockerfile
+config/containers/Dockerfile
 
 # Don't share individual sites files.
 /wordpress/*

.env-example → config/.env-example

@@ -6,13 +6,13 @@
 # 2. Replace the sample credentials with your own.
 
 # The name of the database for WordPress
-MYSQL_DATABASE=database_name_here
+MYSQL_DATABASE=
 
 # MySQL database username
-MYSQL_USER=username_here
+MYSQL_USER=
 
 # MySQL database password
-MYSQL_PASSWORD=mysql_password_here
+MYSQL_PASSWORD=
 
 # MySQL root password
-MYSQL_ROOT_PASSWORD=mysql_root_password_here
+MYSQL_ROOT_PASSWORD=

config/php/php.ini

@@ -0,0 +1,9 @@
+error_reporting        = E_ALL
+display_startup_errors = On
+display_errors         = On
+
+upload_max_filesize = 100M
+post_max_size       = 100M
+
+max_execution_time        = 3600
+request_terminate_timeout = 3600

docker-compose.yml

@@ -18,7 +18,7 @@ services:
         container_name: wordpress
         depends_on:
             - db
-        build: "./config/wordpress"
+        build: "./config/containers"
         ports:
             - "8000:80"
         restart: always
@@ -33,7 +33,7 @@ services:
             - "./wordpress:/var/www/html/"
             - "./plugins:/var/www/html/wp-content/plugins"
             - "./themes:/var/www/html/wp-content/themes"
-            - "./uploads.ini:/usr/local/etc/php/conf.d/uploads.ini"
+            - "./config/php/php.ini:/usr/local/etc/php/conf.d/custom.ini"
 
 volumes:
     db_data: {}

start.sh

@@ -3,10 +3,14 @@
 USER_ID=`id -u`
 GROUP_ID=`id -g`
 
-if [ ! -f './config/wordpress/Dockerfile' ]; then
-	cp './config/wordpress/Dockerfile.template' './config/wordpress/Dockerfile'
-	sed -i '' -e "s/\$UID/${USER_ID}/g" './config/wordpress/Dockerfile'
-	sed -i '' -e "s/\$GID/${GROUP_ID}/g" './config/wordpress/Dockerfile'
+if [ ! -f './config/containers/Dockerfile' ]; then
+	cp './config/containers/Dockerfile.template' './config/containers/Dockerfile'
+	sed -i '' -e "s/\$UID/${USER_ID}/g" './config/containers/Dockerfile'
+	sed -i '' -e "s/\$GID/${GROUP_ID}/g" './config/containers/Dockerfile'
+fi
+
+if [ ! -f './.env' ]; then
+	cp './config/.env-example' './.env'
 fi
 
 docker-compose up --detach