diff --git a/docker/ews/Dockerfile b/docker/ews/Dockerfile index f2224c3b..d8395dfd 100644 --- a/docker/ews/Dockerfile +++ b/docker/ews/Dockerfile @@ -1,8 +1,8 @@ FROM alpine - +# # Include dist ADD dist/ /root/dist/ - +# # Install packages RUN apk -U --no-cache add \ build-base \ @@ -10,45 +10,40 @@ RUN apk -U --no-cache add \ libffi-dev \ libssl1.1 \ openssl-dev \ - python-dev \ - py-cffi \ - py-ipaddress \ - py-lxml \ - py-mysqldb \ - py-pip \ - py-pysqlite \ - py-requests \ - py-setuptools && \ - pip install --no-cache-dir -U pip && \ - pip install --no-cache-dir pyOpenSSL xmljson && \ - + python3 \ + python3-dev \ + py3-cffi \ + py3-ipaddress \ + py3-lxml \ + py3-mysqlclient \ + py3-requests \ + py3-setuptools && \ + pip3 install --no-cache-dir -U pip && \ + pip3 install --no-cache-dir configparser hpfeeds3 pyOpenSSL xmljson && \ +# # Setup ewsposter - git clone --depth=1 https://github.com/rep/hpfeeds /opt/hpfeeds && \ - cd /opt/hpfeeds && \ - python setup.py install && \ - git clone --depth=1 https://github.com/vorband/ewsposter /opt/ewsposter && \ + git clone --depth=1 https://github.com/dtag-dev-sec/ewsposter /opt/ewsposter && \ mkdir -p /opt/ewsposter/spool /opt/ewsposter/log && \ - +# # Setup user and groups addgroup -g 2000 ews && \ adduser -S -H -u 2000 -D -g 2000 ews && \ chown -R ews:ews /opt/ewsposter && \ - +# # Supply configs mv /root/dist/ews.cfg /opt/ewsposter/ && \ mv /root/dist/*.pem /opt/ewsposter/ && \ - +# # Clean up apk del build-base \ git \ openssl-dev \ - python-dev \ - py-pip \ + python3-dev \ py-setuptools && \ rm -rf /root/* && \ rm -rf /var/cache/apk/* - +# # Run ewsposter STOPSIGNAL SIGINT USER ews:ews -CMD sleep 10 && exec /usr/bin/python -u /opt/ewsposter/ews.py -l 60 +CMD sleep 10 && exec /usr/bin/python3 -u /opt/ewsposter/ews.py -l 60