Changes

docker-compose.yml

@@ -1,3 +1,7 @@
+x-credentials:
+  pb-email: &pb-email admin@propertymap.local
+  pb-password: &pb-password propertymap-dev-2024
+
 services:
   server:
     image: rust:1.84
@@ -21,11 +25,14 @@ services:
       - ./property-data:/app/data:ro
     environment:
       POCKETBASE_URL: http://pocketbase:8090
-      POCKETBASE_ADMIN_EMAIL: ${POCKETBASE_ADMIN_EMAIL:-}
-      POCKETBASE_ADMIN_PASSWORD: ${POCKETBASE_ADMIN_PASSWORD:-}
+      POCKETBASE_ADMIN_EMAIL: *pb-email
+      POCKETBASE_ADMIN_PASSWORD: *pb-password
       SCREENSHOT_URL: http://screenshot:8002
       OLLAMA_URL: http://host.docker.internal:11434
+      OLLAMA_MODEL: gpt-oss:20b
+      PUBLIC_URL: https://perfectpostcodes.schmelczer.dev
       R5_URL: http://r5:8003
+      GOOGLE_MAPS_API_KEY: "AIzaSyBgBn9LjrxHCjb9j1LZbLYpEdCJj-NkHPY"
     depends_on:
       pocketbase:
         condition: service_healthy
@@ -83,6 +90,9 @@ services:
       - pb-data:/pb/pb_data
     networks:
       - dev-network
+    environment:
+      PB_ADMIN_EMAIL: *pb-email
+      PB_ADMIN_PASSWORD: *pb-password
     healthcheck:
       test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8090/api/health"]
       interval: 10s
@@ -90,6 +100,47 @@ services:
       retries: 3
       start_period: 5s
 
+  gluetun:
+    image: qmcgaw/gluetun:v3.40.4
+    volumes:
+      - gluetun-cache-v2:/gluetun
+      - gluetun-auth:/gluetun/auth:ro
+    environment:
+      # See https://github.com/qdm12/gluetun-wiki/tree/main/setup#setup
+      VPN_SERVICE_PROVIDER: mullvad
+      VPN_TYPE: wireguard
+      WIREGUARD_PRIVATE_KEY: "8FFKmtTvDsZlShnKl/opDDwCwb9v2ox4+Kkl3wX+9Gw="
+      WIREGUARD_ADDRESSES: "10.66.109.86/32"
+      OWNED_ONLY: "yes"
+      UPDATER_PERIOD: 24h
+      SERVER_COUNTRIES: Serbia,Slovakia,Croatia,Austria,Denmark,Finland
+      TZ: $TIME_ZONE
+    restart: unless-stopped
+    ports:
+      - "1234:1234"
+    healthcheck:
+      test: "wget -q https://www.google.com || exit 1"
+      interval: 1m
+      timeout: 15s
+      retries: 2
+    cap_add:
+      - NET_ADMIN
+    devices:
+      - /dev/net/tun:/dev/net/tun
+
+
+  finder:
+    build: ./finder
+    init: true
+    network_mode: service:gluetun
+    volumes:
+      - ./finder:/app
+      - ./property-data/arcgis_data.parquet:/data/arcgis_data.parquet:ro
+    depends_on:
+      gluetun:
+        condition: service_healthy
+    restart: unless-stopped
+
   r5:
     init: true
     build: ./r5-java
@@ -119,6 +170,8 @@ volumes:
   frontend-node-modules:
   screenshot-cache:
   r5-network:
+  gluetun-cache-v2:
+  gluetun-auth:
 
 networks:
   dev-network: