From 435e6bc411b33ecfebc55c6e0e29adda562d4d89 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Tue, 9 Jul 2024 12:52:27 +0200
Subject: [PATCH] readme

---
 README.md | 68 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 9624ba5..eb65218 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,6 @@ git clone --recursive -o figli https://figureslibres.io/gitea/bachir/docker-cara
 
 submodules :
 - https://figureslibres.io/gitea/bachir/drupal-caravane
-- https://figureslibres.io/gitea/bachir/nuxt-caravane
 
 
 ## touch log file
@@ -37,7 +36,7 @@ touch log/nginx/caravane/error.log
 
 ### setup /sites/default/settings.php
 
-```cp -r ressources/api/* api/src/web/sites/default/```
+```cp -r ressources/api/* src/web/sites/default/```
 
 ### get the sites/default/salt.txt file (if you don't have it, you don't)
 
@@ -149,21 +148,18 @@ Be aware that a first up, since the db is empty, it will be populated with your
 ## Drupal Composer install
 Only at first up, finish to install drupal composer dependencies
 ```
-make exec_api
+make exec_php
 composer install
 ```
 
 ## Visualize
-You can now visit :
-the app http://dev.caravane.fr
-or the api http://dev.caravane.fr/api
-on your browser
+You can now visit http://dev.caravane.fr on your browser
 
 ## Coding
 ### drush
 you can access to drush by loging into the php container
 ```
-make exec_api
+make exec_php
 ```
 once inside the php container in /var/www/html you can use drush as usual
 
@@ -174,11 +170,9 @@ once inside the php container in /var/www/html you can use drush as usual
 git pull figli master
 # then update all submodules
 git submodule update --recursive --checkout
-# or only one
-git submodule update --checkout app/
-# or
-git submodule update --checkout api/
-make api_maj_config
+# or only
+git submodule update --checkout src/
+make maj_config
 ```
 
 ## Updating manualy mysql db
@@ -215,6 +209,15 @@ build:
 buildnc:
 		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME)
 
+buildncphp:
+		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) php
+
+buildnginx:
+		docker-compose build --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) nginx
+
+buildncnginx:
+		docker-compose build --no-cache --build-arg USER_UID=$(USER_UID) --build-arg USER_UNAME=$(USER_UNAME) --build-arg USER_GID=$(USER_GID) --build-arg USER_GNAME=$(USER_GNAME) nginx
+
 downbuildup: down build up
 
 up:
@@ -226,35 +229,38 @@ ps:
 logs:
 		docker-compose logs -f
 
-api_maj_config: api_crd api_composer_install api_updb api_cim api_cr
+maj_config: crd composer_install updb cim cr
 
-api_crd:
-		docker exec caravane_api_1 /bin/bash -c "drush cache-clear drush"
+crd:
+		docker exec caravane-api-1 /bin/bash -c "drush cache-clear drush"
 
-api_cr:
-		docker exec caravane_api_1 /bin/bash -c "drush cr"
+cr:
+		docker exec caravane-api-1 /bin/bash -c "drush cr"
 
-api_updb:
-		docker exec caravane_api_1 /bin/bash -c "drush updb -y"
+updb:
+		docker exec caravane-api-1 /bin/bash -c "drush updb -y"
 
-api_cim:
-		docker exec caravane_api_1 /bin/bash -c "drush config-import -y"
+cim:
+		docker exec caravane-api-1 /bin/bash -c "drush config-import -y"
 
-api_composer_install:
-		docker exec caravane_api_1 /bin/bash -c "composer install --no-dev"
+composer_install:
+		docker exec caravane-api-1 /bin/bash -c "composer install --no-dev"
 
 down:
 		docker-compose down
 
 exec_api:
-		docker exec -it caravane_api_1 bash
+		docker exec -it caravane-api-1 bash
 
-exec_app:
-		docker exec -it caravane_app_1 sh
-
-restart_app:
-  docker-compose restart app
+restart_api:
+	docker-compose restart api
 
 exec_mysql:
-		docker exec -it caravane_mysql_1 bash
+		docker exec -it caravane-mysql-1 bash
+
+restart_nginx:
+	docker-compose restart nginx
+
+dump_db:
+	docker exec caravane-mysql-1 sh -c 'exec mysqldump -uroot -pcaravane caravane' > ./ressources/caravane-$(DATE_NOW)-local.sql
 ```