Dockerfile still not installing basemap

Author: Vincent Grimmeisen

Dockerfile

@@ -4,8 +4,9 @@ RUN cat /etc/issue
 
 RUN pip install matplotlib
 RUN pip install numpy
-RUN apt update && apt install -y python-mpltoolkits.basemap
-
+RUN pip install requests
+#RUN apt update && apt install -y python-mpltoolkits.basemap
+RUN pip install https://github.com/matplotlib/basemap/archive/v1.0.7rel.tar.gz
 RUN echo 'alias e=exit' >> ~/.bashrc
 RUN echo 'alias c=clear' >> ~/.bashrc
 

analyse.py

@@ -4,7 +4,7 @@
 import codecs
 import os
 import time
-
+import sys
 def getInfo(ip):
     resp = requests.get('http://ip-api.com/json/' + ip)
     if resp.status_code != 200:
@@ -15,12 +15,15 @@ def getInfo(ip):
         data_formated = {"ip": ip, "lon": data["lon"], "lat": data["lat"], "country": data["country"], "isp": data["isp"],"org": data["org"] }
     return data_formated
 
-def getIps():
-    f = open('ips.txt','r')
+def readIpFile(filename):
+    script_dir = os.getcwd()
+    s = "input/"
+    s += filename
+    filepath = os.path.join(script_dir, s)
+    f = open(filepath,'r')
     ips = []
     for line in f:
         ips.append(line.rstrip("\n"))
-        #print(line.rstrip("\n"))
     return ips
 
 def generatePayload(ips):
@@ -33,7 +36,7 @@ def batchRequest(ips):
     payload = generatePayload(ips)
     resp = requests.post('http://ip-api.com/batch', data=json.dumps(payload))
     if resp.status_code != 200:
-        data_formated = "Error while getting Data for ", ip
+        data_formated = "Error while getting Data"
     if resp.status_code == 422:
         data_formated = "Too much IPs in request"
     else:
@@ -42,25 +45,25 @@ def batchRequest(ips):
 
 
 def main():
-    ips = getIps()
-    ip_arry = []
-    # Cut array in chunks because of the api limitation
-    chunks = [ips[x:x+100] for x in range(0, len(ips), 100)]
-    for c,l in enumerate(chunks):
-
-        data = batchRequest(l)
-        time.sleep( 1 )
-        script_dir = os.path.dirname(r'C:\Users\admin\Documents\git\pyAuthLog\data')
-        s = "data\\"
-        s +=  str(c)
-        s += "_output.json"
-        absPath = os.path.join(script_dir, s)
-        print("Chunk Number ", str(c) + " Path: " + str(absPath) )
-        with open(absPath, "wb") as outfile:
-            json.dump(data,codecs.getwriter('utf-8')(outfile), ensure_ascii=False)
-
-
-
+    if len(sys.argv) < 2:
+        print("Usage: analyse.py <Filename in /input>")
+        sys.exit()
+    else:
+        ips = readIpFile(sys.argv[1])
+        # Cut array in chunks because of the api limitation
+        chunks = [ips[x:x+100] for x in range(0, len(ips), 100)]
+        for c,l in enumerate(chunks):
+            data = batchRequest(l)
+            # More than 150 Requests per Second will get you blocked
+            time.sleep( 1 )
+            script_dir = os.getcwd()
+            s = "data/"
+            s +=  str(c)
+            s += "_output.json"
+            absPath = os.path.join(script_dir, s)
+            print("Chunk Number ", str(c) + " Path: " + str(absPath) )
+            with open(absPath, "wb") as outfile:
+                json.dump(data,codecs.getwriter('utf-8')(outfile), ensure_ascii=False)
 
 
 

input/19-04-19_ips.txt

@@ -5774,4 +5774,4 @@
 23.95.113.42
 118.25.221.166
 211.171.43.72
-58.242.83.29
+58.242.83.29