From 387a4aa7a69210bacd70d7c7bbf024f5e24e1592 Mon Sep 17 00:00:00 2001
From: ndurand <n.durand@alkante.com>
Date: Fri, 4 Apr 2025 15:52:52 +0200
Subject: [PATCH] add geostyler config
---
development.yml | 71 +++++++++++++++-----------
init/config/proxy/conf/admincarto.conf | 2 +-
2 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/development.yml b/development.yml
index 45e3ba4..cb5b730 100644
--- a/development.yml
+++ b/development.yml
@@ -87,22 +87,22 @@ services:
# - ALL
ppr_prodige_admincarto_web:
- restart: "no"
- # image: ppr_prodige_admincarto_dev_web
- # container_name: ppr_prodige_admincarto_web
- # build: ../prodige/ppr_prodige_admincarto/cicd/dev/web
- # command: entrypoint_dev # Avoid uprod.sh execution
- # volumes:
- # - ../prodige/ppr_prodige_admincarto:/var/www/html # Mount source code
- # - ~/.ssh:/var/www/.ssh
- # env_file:
- # - ./docker-compose.env
- # networks:
- # default:
- # aliases:
- # - prodige-admincarto
- # cap_add:
- # - ALL
+ restart: "no"
+ image: ppr_prodige_admincarto_dev_web
+ container_name: ppr_prodige_admincarto_web
+ build: ../prodige/ppr_prodige_admincarto/cicd/dev/web
+ command: entrypoint_dev # Avoid uprod.sh execution
+ volumes:
+ - ../prodige/ppr_prodige_admincarto:/var/www/html # Mount source code
+ - ~/.ssh:/var/www/.ssh
+ env_file:
+ - ./docker-compose.env
+ networks:
+ default:
+ aliases:
+ - prodige-admincarto
+ cap_add:
+ - ALL
jpr_prodige_cas_web:
restart: "no"
@@ -220,17 +220,17 @@ services:
# - ALL
ppr_prodige_mapserver_api_web:
- restart: "no"
- # image: ppr_prodige_mapserver_api_dev_web
- # container_name: ppr_prodige_mapserver_api_web
- # build: ../prodige/ppr_prodige_mapserver_api/cicd/dev/web
- # command: entrypoint_dev # Prevent uprod.sh execution
- # volumes:
- # - ../prodige/ppr_prodige_mapserver_api:/var/www/html # Mount this code sources (../..) in container
- # env_file:
- # - ./docker-compose.env
- # cap_add:
- # - ALL
+ restart: "no"
+ image: ppr_prodige_mapserver_api_dev_web
+ container_name: ppr_prodige_mapserver_api_web
+ build: ../prodige/ppr_prodige_mapserver_api/cicd/dev/web
+ command: entrypoint_dev # Prevent uprod.sh execution
+ volumes:
+ - ../prodige/ppr_prodige_mapserver_api:/var/www/html # Mount this code sources (../..) in container
+ env_file:
+ - ./docker-compose.env
+ cap_add:
+ - ALL
ngpr_prodige_table_editeur_web:
restart: "no"
@@ -409,8 +409,21 @@ services:
# cap_add:
# - ALL
- # EN DEVELOPPEMENT
- # ngpr_prodige_vues_web:
+ # Pour utiliser bdl-alkante-visualiseur-core avec pr_prodige
+ rpr-prodige-geostyler-web:
+ restart: "no"
+ image: rpr-prodige-geostyler_dev_web
+ container_name: rpr-prodige-geostyler_web
+ build: ../prodige/rpr_prodige_geostyler/cicd/dev/web
+ volumes:
+ - ../prodige/rpr_prodige_geostyler:/home/node/app # Mount this code sources (../..) in container
+ env_file:
+ - ./docker-compose.env
+ cap_add:
+ - ALL
+
+ # EN DEVELOPPEMENT
+ # ngpr_prodige_vues_web:
# restart: "no"
# image: ngpr_prodige_vues_dev_web
# container_name: ngpr_prodige_vues_web
diff --git a/init/config/proxy/conf/admincarto.conf b/init/config/proxy/conf/admincarto.conf
index 815960b..4fc8296 100644
--- a/init/config/proxy/conf/admincarto.conf
+++ b/init/config/proxy/conf/admincarto.conf
@@ -32,7 +32,7 @@ server {
proxy_set_header X-Forwarded-Proto "https";
proxy_set_header X-Real-IP $remote_addr;
resolver 127.0.0.11 valid=10s;
- set $geostyler rpr_prodige_geostyler_dev_node;
+ set $geostyler rpr-prodige-geostyler_web;
proxy_pass http://$geostyler:80;
}
}
--
GitLab