Refacto folder name

Sp0ne · Nov 17, 2020 · 5e02aaa · 5e02aaa
1 parent 32b3ff4
commit 5e02aaa
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ Now you can access to your environnement:
 This package comes with default configuration options. 
 You can modify them by creating (Step 2.) .env file in your root directory. 
 
-> PHP_INI: In each PHP Bin  you can define your custom php.ini `/bin/{PHP_VERSION}/php.ini` to meet your requirements.
+> PHP_INI: In each PHP Bin  you can define your custom php.ini `/docker/{PHP_VERSION}/php.ini` to meet your requirements.
 
 #### Entry Point
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     webserver:
         build:
-            context: ./bin/php/${PHP_VERSION}
+            context: ./docker/php/${PHP_VERSION}
         container_name: '${PROJECT_NAME}-webserver-${PHP_VERSION}'
         restart: 'always'
         working_dir: "${PROJECT_WORKING_DIR}"
@@ -19,7 +19,7 @@ services:
             - "${PROJECT_PATH_LOCALHOST}:/var/www/html"
             # apache vhosts
             - "${APACHE_VHOSTS_DIR}:/etc/apache2/sites-enabled"
-            - "./bin/php/${PHP_VERSION}/php.ini:/usr/local/etc/php/php.ini"
+            - "./docker/php/${PHP_VERSION}/php.ini:/usr/local/etc/php/php.ini"
             - "${APACHE_LOG_DIR}:/var/log/apache2"
             # TODO
             # ssh git auth
@@ -43,7 +43,7 @@ services:
 
     database:
         build:
-            context: "./bin/${DATABASE}"
+            context: "./docker/${DATABASE}"
         container_name: '${PROJECT_NAME}-database-${DATABASE}'
         restart: 'no'
         ports:

diff --git a/bin/mariadb/.gitkeep → docker/mariadb/.gitkeep b/bin/mariadb/.gitkeep → docker/mariadb/.gitkeep
diff --git a/bin/mariadb/Dockerfile → docker/mariadb/Dockerfile b/bin/mariadb/Dockerfile → docker/mariadb/Dockerfile
diff --git a/bin/mysql/.gitkeep → docker/mysql/.gitkeep b/bin/mysql/.gitkeep → docker/mysql/.gitkeep
diff --git a/bin/mysql/Dockerfile → docker/mysql/Dockerfile b/bin/mysql/Dockerfile → docker/mysql/Dockerfile
diff --git a/bin/mysql8/.gitkeep → docker/mysql8/.gitkeep b/bin/mysql8/.gitkeep → docker/mysql8/.gitkeep
diff --git a/bin/mysql8/Dockerfile → docker/mysql8/Dockerfile b/bin/mysql8/Dockerfile → docker/mysql8/Dockerfile
diff --git a/bin/node/.gitkeep → docker/node/.gitkeep b/bin/node/.gitkeep → docker/node/.gitkeep
diff --git a/bin/node/10.16/Dockerfile → docker/node/10.16/Dockerfile b/bin/node/10.16/Dockerfile → docker/node/10.16/Dockerfile
diff --git a/bin/node/12.4/Dockerfile → docker/node/12.4/Dockerfile b/bin/node/12.4/Dockerfile → docker/node/12.4/Dockerfile
diff --git a/bin/php/.gitkeep → docker/php/.gitkeep b/bin/php/.gitkeep → docker/php/.gitkeep
diff --git a/bin/php/5.6/Dockerfile → docker/php/5.6/Dockerfile b/bin/php/5.6/Dockerfile → docker/php/5.6/Dockerfile
diff --git a/bin/php/5.6/php.ini → docker/php/5.6/php.ini b/bin/php/5.6/php.ini → docker/php/5.6/php.ini
diff --git a/bin/php/5.6/xdebug.ini → docker/php/5.6/xdebug.ini b/bin/php/5.6/xdebug.ini → docker/php/5.6/xdebug.ini
diff --git a/bin/php/7.2/Dockerfile → docker/php/7.2/Dockerfile b/bin/php/7.2/Dockerfile → docker/php/7.2/Dockerfile
diff --git a/bin/php/7.2/php.ini → docker/php/7.2/php.ini b/bin/php/7.2/php.ini → docker/php/7.2/php.ini
diff --git a/bin/php/7.2/xdebug.ini → docker/php/7.2/xdebug.ini b/bin/php/7.2/xdebug.ini → docker/php/7.2/xdebug.ini
diff --git a/bin/php/7.4/Dockerfile → docker/php/7.4/Dockerfile b/bin/php/7.4/Dockerfile → docker/php/7.4/Dockerfile
diff --git a/bin/php/7.4/php.ini → docker/php/7.4/php.ini b/bin/php/7.4/php.ini → docker/php/7.4/php.ini
diff --git a/bin/php/7.4/xdebug.ini → docker/php/7.4/xdebug.ini b/bin/php/7.4/xdebug.ini → docker/php/7.4/xdebug.ini
diff --git a/makefile b/makefile
@@ -9,19 +9,19 @@ env: ## Init Env file
 	cp .env.dist .env
 
 run: ## Start docker
-	./console/run.sh
+	./sh/run.sh
 
 run-build: ## Build docker and start it
-	./console/run.sh -f
+	./sh/run.sh -f
 
 run-php: ## Access into your container php
-	./console/run-php.sh
+	./sh/run-php.sh
 
 generate-vhosts: ## Create vhosts files .conf
-	./console/run-vhosts.sh
+	./sh/run-vhosts.sh
 
 check-vhosts: ## Check if url is available
-	./console/run-vhosts-check.sh
+	./sh/run-vhosts-check.sh
 
 refresh-repos: ## Git Pull on ALL FOLDER of project
-	./console/git-refresh-projects.sh
+	./sh/git-refresh-projects.sh
diff --git a/console/git-refresh-projects.sh → sh/git-refresh-projects.sh b/console/git-refresh-projects.sh → sh/git-refresh-projects.sh
diff --git a/console/run-php.sh → sh/run-php.sh b/console/run-php.sh → sh/run-php.sh
diff --git a/console/run-vhosts-check.sh → sh/run-vhosts-check.sh b/console/run-vhosts-check.sh → sh/run-vhosts-check.sh
diff --git a/console/run-vhosts.sh → sh/run-vhosts.sh b/console/run-vhosts.sh → sh/run-vhosts.sh
diff --git a/console/run.sh → sh/run.sh b/console/run.sh → sh/run.sh