Fix backend docker config path for GeoIP data

backend/src/__tests__/config.test.ts

@@ -108,10 +108,10 @@ describe('Mempool Backend Config', () => {
       });
 
       expect(config.MAXMIND).toStrictEqual({
-        ENABLED: false,
-        GEOLITE2_CITY: '/usr/local/share/GeoIP/GeoLite2-City.mmdb',
-        GEOLITE2_ASN: '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb',
-        GEOIP2_ISP: '/usr/local/share/GeoIP/GeoIP2-ISP.mmdb'
+        ENABLED: true,
+        GEOLITE2_CITY: './backend/GeoIP/GeoLite2-City.mmdb',
+        GEOLITE2_ASN: './backend/GeoIP/GeoLite2-ASN.mmdb',
+        GEOIP2_ISP: ''
       });
     });
   });

docker/README.md

@@ -438,7 +438,7 @@ Corresponding `docker-compose.yml` overrides:
 `mempool-config.json`:
 ```json
   "MAXMIND": {
-    "ENABLED": false,
+    "ENABLED": true,
     "GEOLITE2_CITY": "/usr/local/share/GeoIP/GeoLite2-City.mmdb",
     "GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb",
     "GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb"
@@ -449,9 +449,9 @@ Corresponding `docker-compose.yml` overrides:
 ```yaml
   api:
     environment:
-      MAXMIND_ENABLED: "",
-      MAXMIND_GEOLITE2_CITY: "/usr/local/share/GeoIP/GeoLite2-City.mmdb",
-      MAXMIND_GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb",
-      MAXMIND_GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb"
+      MAXMIND_ENABLED: true,
+      MAXMIND_GEOLITE2_CITY: "/backend/GeoIP/GeoLite2-City.mmdb",
+      MAXMIND_GEOLITE2_ASN": "/backend/GeoIP/GeoLite2-ASN.mmdb",
+      MAXMIND_GEOIP2_ISP": "/backend/GeoIP/GeoIP2-ISP.mmdb"
       ...
 ```

docker/backend/Dockerfile

@@ -17,6 +17,7 @@ WORKDIR /backend
 
 RUN chown 1000:1000 ./
 COPY --from=builder --chown=1000:1000 /build/package ./package/
+COPY --from=builder --chown=1000:1000 /build/GeoIP ./GeoIP/
 COPY --from=builder --chown=1000:1000 /build/mempool-config.json /build/start.sh /build/wait-for-it.sh ./
 
 USER 1000

docker/backend/mempool-config.json

@@ -109,9 +109,9 @@
     "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__"
   },
   "MAXMIND": {
-    "ENABLED": "__MAXMIND_ENABLED__",
+    "ENABLED": __MAXMIND_ENABLED__,
     "GEOLITE2_CITY": "__MAXMIND_GEOLITE2_CITY__",
     "GEOLITE2_ASN": "__MAXMIND_GEOLITE2_ASN__",
     "GEOIP2_ISP": "__MAXMIND_GEOIP2_ISP__"
   }
-}
+}

docker/backend/start.sh

@@ -112,10 +112,10 @@ __LND_REST_API_URL__=${LND_REST_API_URL:="https://localhost:8080"}
 __CLIGHTNING_SOCKET__=${CLIGHTNING_SOCKET:=""}
 
 # MAXMIND
-__MAXMIND_ENABLED__=${MAXMIND_ENABLED:=false}
-__MAXMIND_GEOLITE2_CITY__=${MAXMIND_GEOLITE2_CITY:="/usr/local/share/GeoIP/GeoLite2-City.mmdb"}
-__MAXMIND_GEOLITE2_ASN__=${MAXMIND_GEOLITE2_ASN:="/usr/local/share/GeoIP/GeoLite2-ASN.mmdb"}
-__MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_IS:="/usr/local/share/GeoIP/GeoIP2-ISP.mmdb"}
+__MAXMIND_ENABLED__=${MAXMIND_ENABLED:=true}
+__MAXMIND_GEOLITE2_CITY__=${MAXMIND_GEOLITE2_CITY:="/backend/GeoIP/GeoLite2-City.mmdb"}
+__MAXMIND_GEOLITE2_ASN__=${MAXMIND_GEOLITE2_ASN:="/backend/GeoIP/GeoLite2-ASN.mmdb"}
+__MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_ISP:=""}
 
 
 mkdir -p "${__MEMPOOL_CACHE_DIR__}"

docker/init.sh

@@ -3,6 +3,11 @@
 #backend
 cp ./docker/backend/* ./backend/
 
+#geoip-data
+mkdir -p ./backend/GeoIP/
+wget -O ./backend/GeoIP/GeoLite2-City.mmdb https://raw.githubusercontent.com/mempool/geoip-data/master/GeoLite2-City.mmdb
+wget -O ./backend/GeoIP/GeoLite2-ASN.mmdb https://raw.githubusercontent.com/mempool/geoip-data/master/GeoLite2-ASN.mmdb
+
 #frontend
 localhostIP="127.0.0.1"
 cp ./docker/frontend/* ./frontend