Switch CGImap to service a UNIX socket

Author: cyrossignol

docker-compose.deploy.yml

@@ -1,7 +1,7 @@
 #
 # This file is only used by the CI/CD pipeline to deploy images to the environment's VM.
 #
-# For any local dev work, see docker-compose.yml and *overrides.yml. 
+# For any local dev work, see docker-compose.yml and *overrides.yml.
 #
 
 ################################################################################
@@ -142,6 +142,8 @@ services:
     depends_on:
       - osm-rails
       - osm-cgimap
+    volumes:
+      - osm-cgimap-socket:/run/cgimap
     labels:
       - traefik.enable=true
       - traefik.http.routers.osm-web.rule=Host(`${WS_OSM_HOST}`)
@@ -161,6 +163,7 @@ services:
     image: ${WS_DOCKER_REGISTRY}/workspaces-osm-cgimap:${WS_DOCKER_TAG}
     restart: always
     environment:
+      CGIMAP_SOCKET: /run/cgimap/cgimap.sock
       CGIMAP_INSTANCES: ${WS_CGIMAP_INSTANCES}
       CGIMAP_HOST: ${WS_OSM_DB_HOST}
       CGIMAP_USERNAME: ${WS_OSM_DB_USER}
@@ -170,6 +173,8 @@ services:
       CGIMAP_MAX_PAYLOAD: ${WS_OSM_MAX_UPLOAD_BYTES}
       CGIMAP_MAP_NODES: ${WS_OSM_MAX_EXPORT_NODES}
       CGIMAP_MAP_AREA: ${WS_OSM_MAX_EXPORT_AREA}
+    volumes:
+      - osm-cgimap-socket:/run/cgimap
 
   tasks-backend:
     image: ${WS_DOCKER_REGISTRY}/workspaces-tasks-backend:${WS_DOCKER_TAG}
@@ -214,3 +219,4 @@ services:
 volumes:
   osm-rails-tmp:
   osm-rails-storage:
+  osm-cgimap-socket:

docker-compose.yml

@@ -120,6 +120,7 @@ services:
     volumes:
       - ./osm-web/nginx.conf:/etc/nginx/conf.d/default.conf:ro
       - ./osm-rails/public:/usr/share/nginx/html:ro
+      - osm-cgimap-socket:/run/cgimap
     labels:
       - traefik.enable=true
       - traefik.http.routers.osm-web.rule=Host(`${WS_OSM_HOST}`)
@@ -141,6 +142,7 @@ services:
       context: osm-cgimap
       dockerfile: docker/ubuntu/Dockerfile2404
     environment:
+      CGIMAP_SOCKET: /run/cgimap/cgimap.sock
       CGIMAP_INSTANCES: ${WS_CGIMAP_INSTANCES}
       CGIMAP_HOST: ${WS_OSM_DB_HOST}
       CGIMAP_USERNAME: ${WS_OSM_DB_USER}
@@ -150,6 +152,8 @@ services:
       CGIMAP_MAX_PAYLOAD: ${WS_OSM_MAX_UPLOAD_BYTES}
       CGIMAP_MAP_NODES: ${WS_OSM_MAX_EXPORT_NODES}
       CGIMAP_MAP_AREA: ${WS_OSM_MAX_EXPORT_AREA}
+    volumes:
+      - osm-cgimap-socket:/run/cgimap
 
  # tasks-frontend:
  #   build:
@@ -195,3 +199,4 @@ volumes:
   osm-rails-tmp:
   osm-rails-storage:
   osm-rails-db-data:
+  osm-cgimap-socket:

osm-web/nginx.conf

@@ -103,7 +103,7 @@ server {
     # Handle requests for the endpoints implemented in CGImap:
     #
     location ~ \.map$ {
-        fastcgi_pass osm-cgimap:8000;
+        fastcgi_pass unix:/run/cgimap/cgimap.sock;
 
         # Large dataset uploads may take a long time to process
         fastcgi_read_timeout 3h;