From 28681ef3982fb5ddc26f284c7b5c958e413b12f2 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Fri, 1 Oct 2021 14:32:24 +0000
Subject: [PATCH] prep heralding rebuild

---
 docker/heralding/Dockerfile         | 13 +++++--------
 docker/heralding/docker-compose.yml |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/docker/heralding/Dockerfile b/docker/heralding/Dockerfile
index 00d74601..23d8bce6 100644
--- a/docker/heralding/Dockerfile
+++ b/docker/heralding/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 #  
 # Include dist
 ADD dist/ /root/dist/
@@ -12,12 +12,9 @@ RUN apk -U --no-cache add \
             		openssl-dev \
                         libzmq \
             		postgresql-dev \
-			py3-cryptography \
 			py3-pip \
-			py3-pyzmq \
             		python3 \
-            		python3-dev \
-            		py-virtualenv && \
+            		python3-dev && \
 #
 # Setup heralding
     mkdir -p /opt && \
@@ -25,6 +22,7 @@ RUN apk -U --no-cache add \
     git clone https://github.com/johnnykv/heralding && \
     cd heralding && \
     git checkout 3f38976a2ab4d884d755b6324f2c71923ddadbdb && \
+    pip3 install --upgrade pip && \
     pip3 install --no-cache-dir -r requirements.txt && \
     pip3 install --no-cache-dir . && \
 #
@@ -33,7 +31,7 @@ RUN apk -U --no-cache add \
     adduser -S -H -s /bin/ash -u 2000 -D -g 2000 heralding && \
     mkdir -p /var/log/heralding/ /etc/heralding && \
     mv /root/dist/heralding.yml /etc/heralding/ && \
-    setcap cap_net_bind_service=+ep /usr/bin/python3.8 && \
+    setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \
     chown -R heralding:heralding /var/log/heralding && \
 #
 # Clean up
@@ -44,8 +42,7 @@ RUN apk -U --no-cache add \
             libffi-dev \
             libressl-dev \
             postgresql-dev \
-            python3-dev \
-            py-virtualenv && \
+            python3-dev && \
     rm -rf /root/* \
            /var/cache/apk/* \
            /opt/heralding
diff --git a/docker/heralding/docker-compose.yml b/docker/heralding/docker-compose.yml
index b3e610ff..9df2f1e7 100644
--- a/docker/heralding/docker-compose.yml
+++ b/docker/heralding/docker-compose.yml
@@ -31,7 +31,7 @@ services:
      - "3389:3389"
      - "5432:5432"
      - "5900:5900"
-    image: "ghcr.io/telekom-security/heralding:2006"
+    image: "dtagdevsec/heralding:2006"
     read_only: true
     volumes:
      - /data/heralding/log:/var/log/heralding