diff --git a/Dockerfile-front b/Dockerfile-front index bc28b92..32628e7 100644 --- a/Dockerfile-front +++ b/Dockerfile-front @@ -13,6 +13,7 @@ RUN mv TaxHub-1.7.3 taxhub COPY patches/settings.ini /home/appuser/citizen/config/settings.ini COPY patches/frontend/src/conf /home/appuser/citizen/frontend/src/conf COPY patches/frontend/src/assets /home/appuser/citizen/frontend/src/assets +COPY patches/frontend/server.ts /home/appuser/citizen/frontend/server.ts WORKDIR /home/appuser/citizen/frontend diff --git a/README b/README index 95cda9d..a386f1f 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +TODO FUSION entre README & README.md + # gl-geonature L'instance Geonature-Citizen de Champs-Libres. @@ -52,17 +54,9 @@ taxhub $ npm install ### Citizen-front ``` -docker-compose up -d citizen-front -``` - - -Compilation du JS - - -``` - $ docker-compose exec citizen-front bash -frontend $ npm install -frontend $ npm run build:fr +$ docker-compose run --rm citizen-front npm install +$ docker-compose run --rm citizen-front run build:i18n-ssr +$ docker-compose up -d citizen-front ``` diff --git a/README.md b/README.md index 98588cf..8a272a1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +TODO FUSION entre README & README.md + # gl-geonature L'instance Geonature-Citizen de Champs-Libres. @@ -26,9 +28,14 @@ $ git submodule foreach git pull git@github.com:Champs-Libres/GeoNature-citizen. $ make doc -### Builder le front (pour production) +### Builder le front (pour production) (avant de pouvoir faire le docker up) ``` +$ 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 +``` + $ docker-compose exec citizen bash appuser@ab136184159a:~/citizen/$ cd frontend appuser@ab136184159a:~/citizen/frontend$ npm run ng build -- --configuration=fr --prod diff --git a/docker-compose.override.yml b/docker-compose.override.yml index a136ba1..8545a68 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -34,7 +34,6 @@ services: - ./node_modules:/home/appuser/citizen/frontend/node_modules ports: - "4000:4000" - - "4200:4200" command: npm run serve:ssr environment: # avoid goodle analytics question