changes

docker-compose.yml

@@ -10,7 +10,7 @@ services:
     command: >
       bash -c "
         cargo install cargo-watch &&
-        cargo watch -x 'run -- --data /app/data/wide.parquet --pois /app/data/filtered_uk_pois.parquet --places /app/data/places.parquet --tiles /app/data/uk.pmtiles --postcodes /app/data/postcode_boundaries --travel-times /app/data/travel-times'
+        cargo watch -i logs/ -x 'run -- --properties /app/data/properties.parquet --postcode-features /app/data/postcode.parquet --listings-buy /app/data/online_listings_buy.parquet --listings-rent /app/data/online_listings_rent.parquet --pois /app/data/filtered_uk_pois.parquet --places /app/data/places.parquet --tiles /app/data/uk.pmtiles --postcodes /app/data/postcode_boundaries --travel-times /app/data/travel-times'
       "
     ports:
       - "8001:8001"
@@ -38,9 +38,9 @@ services:
       STRIPE_REFERRAL_COUPON_ID: L5uQqagl
       GOOGLE_OAUTH_CLIENT_ID: 536485512604-740bbn3tf027ogrdcr5sqor4ntorkaqv.apps.googleusercontent.com
       GOOGLE_OAUTH_CLIENT_SECRET: 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
-      APPLE_OAUTH_CLIENT_ID: ${APPLE_OAUTH_CLIENT_ID}
-      APPLE_OAUTH_CLIENT_SECRET: ${APPLE_OAUTH_CLIENT_SECRET}
     depends_on:
+      screenshot:
+        condition: service_healthy
       pocketbase:
         condition: service_healthy
 
@@ -107,46 +107,46 @@ 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
+  # 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
+  # finder:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile.finder
+  #   init: true
+  #   network_mode: service:gluetun
+  #   volumes:
+  #     - ./finder:/app
+  #   depends_on:
+  #     gluetun:
+  #       condition: service_healthy
+  #   restart: unless-stopped
 
 
 volumes: