From bd0e6936eb5e4ad5d6b049fd469fa3b5fa7b5884 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Fri, 21 Feb 2020 11:38:29 +0000
Subject: [PATCH] bump heralding to latest master
fixed by https://github.com/johnnykv/heralding/issues/129#event-3058184614
---
docker/heralding/Dockerfile | 5 ++---
docker/heralding/docker-compose.yml | 2 +-
etc/compose/nextgen.yml | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/docker/heralding/Dockerfile b/docker/heralding/Dockerfile
index b03a7ec0..da95c7ee 100644
--- a/docker/heralding/Dockerfile
+++ b/docker/heralding/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:latest
#
# Include dist
ADD dist/ /root/dist/
@@ -23,7 +23,6 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
cd /opt/ && \
git clone --depth=1 https://github.com/johnnykv/heralding && \
cd heralding && \
- sed -i 's/asyncssh/asyncssh==1.18.0/' requirements.txt && \
pip3 install --no-cache-dir -r requirements.txt && \
pip3 install --no-cache-dir . && \
#
@@ -32,7 +31,7 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
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.7 && \
+ setcap cap_net_bind_service=+ep /usr/bin/python3.8 && \
chown -R heralding:heralding /var/log/heralding && \
#
# Clean up
diff --git a/docker/heralding/docker-compose.yml b/docker/heralding/docker-compose.yml
index 6f5188e1..15f92661 100644
--- a/docker/heralding/docker-compose.yml
+++ b/docker/heralding/docker-compose.yml
@@ -30,7 +30,7 @@ services:
- "3389:3389"
- "5432:5432"
- "5900:5900"
- image: "dtagdevsec/heralding:1903"
+ image: "dtagdevsec/heralding:2006"
read_only: true
volumes:
- /data/heralding/log:/var/log/heralding
diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml
index 171b539a..64838709 100644
--- a/etc/compose/nextgen.yml
+++ b/etc/compose/nextgen.yml
@@ -250,7 +250,7 @@ services:
- "1080:1080"
- "5432:5432"
- "5900:5900"
- image: "dtagdevsec/heralding:1903"
+ image: "dtagdevsec/heralding:2006"
read_only: true
volumes:
- /data/heralding/log:/var/log/heralding