Merge pull request #469 from Patrowl/enhance-spf

Enhance SPF

engines/owl_dns/Dockerfile

@@ -12,33 +12,32 @@ RUN mkdir -p /opt/patrowl-engines/owl_dns
 RUN mkdir -p /opt/patrowl-engines/owl_dns/results
 RUN mkdir -p /opt/patrowl-engines/owl_dns/external-libs
 
-# Set the working directory to /opt/<engine_name>
-WORKDIR /opt/patrowl-engines/owl_dns
-
-# Copy the current directory contents into the container at /
-COPY __init__.py .
-COPY engine-owl_dns.py .
-COPY owl_dns.json.sample owl_dns.json
-COPY requirements.txt .
-COPY README.md .
-COPY VERSION .
-COPY etc/ etc/
-COPY modules/ modules/
-
 WORKDIR /opt/patrowl-engines/owl_dns/external-libs
 RUN git clone https://github.com/Patrowl/Sublist3r
 WORKDIR /opt/patrowl-engines/owl_dns/external-libs/Sublist3r
 RUN pip3 install --trusted-host pypi.python.org -r requirements.txt
 WORKDIR /opt/patrowl-engines/owl_dns/external-libs
 RUN git clone https://github.com/elceef/dnstwist
 
+# Set the working directory to /opt/<engine_name>
+WORKDIR /opt/patrowl-engines/owl_dns
+
 # Install python modules for engine
-WORKDIR /opt/patrowl-engines/owl_dns/
+COPY requirements.txt .
 RUN pip3 install --upgrade pip
 RUN pip3 install --trusted-host pypi.python.org -r requirements.txt
 
+# Copy the current directory contents into the container at /
+COPY __init__.py .
+COPY engine_owl_dns.py .
+COPY owl_dns.json.sample owl_dns.json
+COPY README.md .
+COPY VERSION .
+COPY etc/ etc/
+COPY modules/ modules/
+
 # TCP port exposed by the container (NAT)
 EXPOSE 5006
 
 # Run app.py when the container launches
-CMD ["gunicorn", "engine-owl_dns:app", "-b", "0.0.0.0:5006", "--access-logfile", "-", "--threads", "10"]
+CMD ["gunicorn", "engine_owl_dns:app", "-b", "0.0.0.0:5006", "--access-logfile", "-", "--threads", "10"]

engines/owl_dns/Dockerfile.ubuntu

@@ -19,7 +19,7 @@ WORKDIR /opt/patrowl-engines/owl_dns/
 
 # Copy the current directory contents into the container at /
 COPY __init__.py .
-COPY engine-owl_dns.py .
+COPY engine_owl_dns.py .
 COPY owl_dns.json.sample owl_dns.json
 COPY requirements.txt .
 COPY README.md .
@@ -48,4 +48,4 @@ RUN pip3 install --trusted-host pypi.python.org -r requirements.txt
 EXPOSE 5006
 
 # Run app.py when the container launches
-CMD ["gunicorn", "engine-owl_dns:app", "-b", "0.0.0.0:5006", "--access-logfile", "-", "--threads", "10"]
+CMD ["gunicorn", "engine_owl_dns:app", "-b", "0.0.0.0:5006", "--access-logfile", "-", "--threads", "10"]

engines/owl_dns/__init__.py

@@ -1,5 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import os
+import sys
+
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 
 __title__ = "patrowl_engine_owl_dns"
 __version__ = "1.5.8"