Tech - Ajout des domaines sans proxy (UPDATE ENV VAR) (#3888)

## Linked issues ``` - MONITORFISH_HTTP_NON_PROXY_HOSTS=$MONITORFISH_HTTP_NON_PROXY_HOSTS ``` ---- - [ ] Tests E2E (Cypress)
MTES-MCT · Nov 25, 2024 · 810d022 · 810d022
2 parents e462031 + 393c637
commit 810d022
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/infra/docker/app/Dockerfile b/infra/docker/app/Dockerfile
@@ -123,7 +123,8 @@ USER monitorfish
 
 ENTRYPOINT ["/home/monitorfish/env.sh"]
 
-CMD exec java -Dhttp.proxyHost=${MONITORFISH_HTTP_HOST} -Dhttp.proxyPort=${MONITORFISH_HTTP_PORT} \
-              -Dhttps.proxyHost=${MONITORFISH_HTTP_HOST} -Dhttps.proxyPort=${MONITORFISH_HTTP_PORT} \
+CMD exec java -Dhttp.proxyHost=${MONITORFISH_HTTP_PROXY_HOST} -Dhttp.proxyPort=${MONITORFISH_HTTP_PROXY_PORT} \
+              -Dhttps.proxyHost=${MONITORFISH_HTTP_PROXY_HOST} -Dhttps.proxyPort=${MONITORFISH_HTTP_PROXY_PORT} \
+              -Dhttp.nonProxyHosts=${MONITORFISH_HTTP_NON_PROXY_HOSTS} -Dhttps.nonProxyHosts=${MONITORFISH_HTTP_NON_PROXY_HOSTS} \
               -Dspring.config.additional-location="/home/monitorfish/configurations/" \
               -jar "monitorfish-${VERSION}.jar"
diff --git a/infra/remote/docker-compose.yml b/infra/remote/docker-compose.yml
@@ -24,8 +24,9 @@ services:
     environment:
       - SPRING_PROFILES_ACTIVE=$MONITORFISH_ENV
       - HOST_IP=127.0.0.1
-      - MONITORFISH_HTTP_HOST=$MONITORFISH_HTTP_HOST
-      - MONITORFISH_HTTP_PORT=$MONITORFISH_HTTP_PORT
+      - MONITORFISH_HTTP_PROXY_HOST=$MONITORFISH_HTTP_PROXY_HOST
+      - MONITORFISH_HTTP_PROXY_PORT=$MONITORFISH_HTTP_PROXY_PORT
+      - MONITORFISH_HTTP_NON_PROXY_HOSTS=$MONITORFISH_HTTP_NON_PROXY_HOSTS
       - ENV_DB_URL=jdbc:postgresql://db:5432/$POSTGRES_DB?user=$POSTGRES_USER&password=$POSTGRES_PASSWORD
       - FRONTEND_GEOSERVER_REMOTE_URL=$MONITORFISH_GEOSERVER_REMOTE_URL
       - FRONTEND_GEOSERVER_LOCAL_URL=$MONITORFISH_GEOSERVER_LOCAL_URL