From c7376a59f0dcb8e281365343248ba6e8d8174ef8 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Wed, 19 Jun 2019 12:41:42 -0400
Subject: [PATCH] Move around docker storage folders/config

---
 .travis/deploy_script.sh                         | 4 ++++
 docker-compose.yml                               | 8 ++++----
 {docker => resources/docker}/nginx/default.conf  | 0
 {docker => resources/docker}/php/Dockerfile      | 0
 {docker => resources/docker}/php/ext-opcache.ini | 0
 {docker => resources/docker}/php/www.conf        | 0
 {docker => storage/docker}/data/.gitignore       | 0
 7 files changed, 8 insertions(+), 4 deletions(-)
 rename {docker => resources/docker}/nginx/default.conf (100%)
 rename {docker => resources/docker}/php/Dockerfile (100%)
 rename {docker => resources/docker}/php/ext-opcache.ini (100%)
 rename {docker => resources/docker}/php/www.conf (100%)
 rename {docker => storage/docker}/data/.gitignore (100%)

diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh
index fcbb724c..7ad05cd5 100755
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -56,6 +56,7 @@ if [ "$TRAVIS" = "true" ]; then
         .idea
         .travis
         docker
+        resources/docker
         tests
         _ide_helper.php
         .dpl
@@ -90,6 +91,9 @@ if [ "$TRAVIS" = "true" ]; then
     # clear any app specific stuff that might have been loaded in
     find storage/app -mindepth 1 -not -name '.gitignore' -not -name public -not -name import -print0 -exec rm -rf {} +
     find storage/app/public -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+    find storage/debugbar -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+    find storage/docker -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
+    find storage/docker/data -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
     find storage/framework/cache -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
     find storage/framework/sessions -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
     find storage/framework/views -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
diff --git a/docker-compose.yml b/docker-compose.yml
index 9cd7406b..684ab176 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,13 +4,13 @@ version: '3'
 services:
   app:
     build:
-      context: ./docker/php
+      context: ./resources/docker/php
     environment:
       DB_HOST: mysql
       REDIS_HOST: redis
     volumes:
       - ./:/var/www
-      - ./docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf
+      - ./resources/docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf
     depends_on:
       - nginx
       - mysql
@@ -21,7 +21,7 @@ services:
     command: /bin/sh -c "exec nginx -g 'daemon off;'"
     volumes:
       - ./:/var/www
-      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf
+      - ./resources/docker/nginx/default.conf:/etc/nginx/conf.d/default.conf
     ports:
       - 80:80
 
@@ -34,7 +34,7 @@ services:
       MYSQL_ROOT_PASSWORD:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
     volumes:
-      - ./docker/data/mysql:/var/lib/mysql
+      - ./storage/docker/data/mysql:/var/lib/mysql
     ports:
       - 3306:3306
 
diff --git a/docker/nginx/default.conf b/resources/docker/nginx/default.conf
similarity index 100%
rename from docker/nginx/default.conf
rename to resources/docker/nginx/default.conf
diff --git a/docker/php/Dockerfile b/resources/docker/php/Dockerfile
similarity index 100%
rename from docker/php/Dockerfile
rename to resources/docker/php/Dockerfile
diff --git a/docker/php/ext-opcache.ini b/resources/docker/php/ext-opcache.ini
similarity index 100%
rename from docker/php/ext-opcache.ini
rename to resources/docker/php/ext-opcache.ini
diff --git a/docker/php/www.conf b/resources/docker/php/www.conf
similarity index 100%
rename from docker/php/www.conf
rename to resources/docker/php/www.conf
diff --git a/docker/data/.gitignore b/storage/docker/data/.gitignore
similarity index 100%
rename from docker/data/.gitignore
rename to storage/docker/data/.gitignore