bump map_server to latest master

docker/elk/map/Dockerfile

@@ -19,6 +19,7 @@ RUN apk -U add \
     cd geoip-attack-map && \
 #    git checkout 4dae740178455f371b667ee095f824cb271f07e8 && \
     #sed "s/MarkupSafe==1.0/MarkupSafe==1.1.1/g" -i requirements.txt && \
+    #cp /root/dist/* . && \
     pip3 install -r requirements.txt && \
     pip3 install flask && \
     setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \
@@ -39,4 +40,4 @@ RUN apk -U add \
 STOPSIGNAL SIGINT
 USER map:map
 WORKDIR /opt/geoip-attack-map
-CMD exec /usr/bin/python3 $MAP_COMMAND
+CMD ./entrypoint.sh && exec /usr/bin/python3 $MAP_COMMAND

docker/elk/map/dist/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/ash
+sed -i "s/var hqLatLng = new L.LatLng(52.3058, 4.932);/var hqLatLng = new L.LatLng($MY_EXTIP_LAT, $MY_EXTIP_LONG);/g" /opt/geoip-attack-map/static/map.js
+#sed -i "s/fillOpacity: 1,/fillOpacity: 0.5,/g" /opt/geoip-attack-map/static/map.js

etc/compose/standard.yml

@@ -544,7 +544,7 @@ services:
       elasticsearch:
         condition: service_healthy
     environment:
-     - MAP_COMMAND=DataServr_v2.py
+     - MAP_COMMAND=DataServer_v2.py
     env_file:
      - /opt/tpot/etc/compose/elk_environment
     stop_signal: SIGKILL