From af3310baff1ac94e6006cbac5de8db7ac01e22f0 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Wed, 12 Jul 2023 09:39:40 +0200
Subject: [PATCH] better installation instructions + fix missing volume in
 docker-compose

---
 README.md                   | 40 +++++++++++--------------------------
 docker-compose.override.yml |  4 ++--
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 4127e4a..c31a37e 100644
--- a/README.md
+++ b/README.md
@@ -31,10 +31,12 @@ $ docker-compose exec db psql -d -U postgres -d referentielsdb -c "CREATE EXTENS
 
 ### Build the other containers
 
-
 ```
 $ docker-compose up
 ```
+
+At this stage, you still have to install Taxhub and compile the front to see the app running!
+
 ### Compile the front
 
 ```
@@ -42,30 +44,21 @@ $ docker-compose run --rm citizen-front npm install
 $ docker-compose run --rm citizen-front npm run build:i18n-ssr
 ```
 
-### Starting
-For starting the application again, you may start the db container first
-
-```
-$ docker-compose up -d db
-$ docker-compose up
-```
-
-
-## Misc.
-### Taxhub
+### Taxhub installation
 
 ```
 $ docker-compose run taxhub bash install_db.sh
 $ docker-compose up -d taxhub
 ```
 
-####  CREATION / Compiation du JS  de Taxhub
+####  Compilation du JS de Taxhub
 
-##### Mise à jour de nppm.
+This is probably not needed as we don't use Taxhub.
+##### Mise à jour de npm
 
 ```
        $ docker-compose exec -u root taxhub bash
-taxhub $ npm install npm@latest -g  # mise à jour de npm
+taxhub $ npm install npm@latest -g
 ```
 
 #### Compilation du code
@@ -77,21 +70,12 @@ taxhub $ cp app/constants.js.sample app/constants.js
 taxhub $ npm install
 ```
 
-
-### Citizen-front
+### Starting
+For starting the application again, you may start the db container first
 
 ```
-$ docker-compose run --rm citizen-front npm install
-$ docker-compose run --rm citizen-front npm run build:i18n-ssr
-$ docker-compose up -d citizen-front
-```
-
-
-### Citizen-back
-
-
-```
-docker-compose up -d citizen-front
+$ docker-compose up -d db
+$ docker-compose up
 ```
 
 ### nginx
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 89c67a8..dc55a79 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -76,8 +76,8 @@ services:
       context: ./nginx
       dockerfile: ./Dockerfile
     image: registry.gitlab.com/champs-libres/geonature-citizen/nginx
-    # volumes:
-    #  - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
+    volumes:
+     - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
     depends_on:
       - "media"
       - "citizen-front"