From f5d11bb008130d0aa3823ed6226990bc618a5d2d Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Fri, 24 Sep 2021 15:18:59 +0000
Subject: [PATCH] bump snare, tanner, prep for rebuild

---
 docker/tanner/docker-compose.yml | 12 ++++++------
 docker/tanner/phpox/Dockerfile   |  6 +++---
 docker/tanner/snare/Dockerfile   |  7 ++++---
 docker/tanner/tanner/Dockerfile  |  5 +++--
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/docker/tanner/docker-compose.yml b/docker/tanner/docker-compose.yml
index ff2e4bec..b70977a3 100644
--- a/docker/tanner/docker-compose.yml
+++ b/docker/tanner/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "ghcr.io/telekom-security/redis:2006"
+    image: "dtagdevsec/redis:2006"
     read_only: true
 
 # PHP Sandbox service
@@ -28,7 +28,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "ghcr.io/telekom-security/phpox:2006"
+    image: "dtagdevsec/phpox:2006"
     read_only: true
 
 # Tanner API Service
@@ -42,7 +42,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "ghcr.io/telekom-security/tanner:2006"
+    image: "dtagdevsec/tanner:2006"
     read_only: true
     volumes:
      - /data/tanner/log:/var/log/tanner
@@ -63,7 +63,7 @@ services:
      - tanner_local
 #    ports:
 #     - "127.0.0.1:8091:8091"
-    image: "ghcr.io/telekom-security/tanner:2006"
+    image: "dtagdevsec/tanner:2006"
     command: tannerweb
     read_only: true
     volumes:
@@ -82,7 +82,7 @@ services:
     tty: true
     networks:
      - tanner_local
-    image: "ghcr.io/telekom-security/tanner:2006"
+    image: "dtagdevsec/tanner:2006"
     command: tanner
     read_only: true
     volumes:
@@ -104,6 +104,6 @@ services:
      - tanner_local
     ports:
      - "80:80"
-    image: "ghcr.io/telekom-security/snare:2006"
+    image: "dtagdevsec/snare:2006"
     depends_on:
      - tanner
diff --git a/docker/tanner/phpox/Dockerfile b/docker/tanner/phpox/Dockerfile
index 95ac7f15..59fa7184 100644
--- a/docker/tanner/phpox/Dockerfile
+++ b/docker/tanner/phpox/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.13
 #
 # Install packages
 RUN apk -U --no-cache add \
@@ -16,7 +16,7 @@ RUN apk -U --no-cache add \
 # Install bfr sandbox from git
     git clone https://github.com/mushorg/BFR /opt/BFR && \
     cd /opt/BFR && \
-    git checkout 508729202428a35bcc6bb27dd97b831f7e5009b5 && \
+#    git checkout 508729202428a35bcc6bb27dd97b831f7e5009b5 && \
     phpize7 && \
     ./configure \
       --with-php-config=/usr/bin/php-config7 \
@@ -30,7 +30,7 @@ RUN apk -U --no-cache add \
 # Install PHP Sandbox
     git clone https://github.com/mushorg/phpox /opt/phpox && \
     cd /opt/phpox && \
-    git checkout 001437b9ed3e228fac3828e18fe90991a330578d && \
+    git checkout a62c8136ec7b3ebab0c989f4235e2960175121f8 && \
     pip3 install -r requirements.txt && \
     make && \
 #
diff --git a/docker/tanner/snare/Dockerfile b/docker/tanner/snare/Dockerfile
index 00759773..0157f6bb 100644
--- a/docker/tanner/snare/Dockerfile
+++ b/docker/tanner/snare/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.14
 #
 # Include dist
 ADD dist/ /root/dist/
@@ -9,12 +9,13 @@ RUN apk -U --no-cache add \
                git \
                linux-headers \
                python3 \
-               python3-dev && \ 
+               python3-dev \ 
+               py3-pip && \ 
 #
 # Setup Snare 
     git clone https://github.com/mushorg/snare /opt/snare && \
     cd /opt/snare/ && \
-    git checkout 5af76755f367dae8acb347962be34eb8de14f85a && \
+    git checkout 0919a80838eb0823a3b7029b0264628ee0a36211 && \
     pip3 install --no-cache-dir setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \
     python3 setup.py install && \
diff --git a/docker/tanner/tanner/Dockerfile b/docker/tanner/tanner/Dockerfile
index b578375c..3c29c4df 100644
--- a/docker/tanner/tanner/Dockerfile
+++ b/docker/tanner/tanner/Dockerfile
@@ -9,7 +9,7 @@ RUN apk -U --no-cache add \
                git \
                libcap \
                libffi-dev \
-               libressl-dev \
+               openssl-dev \
                linux-headers \
 	       py3-pip \
                py3-yarl \
@@ -21,7 +21,8 @@ RUN apk -U --no-cache add \
     cd /opt/tanner/ && \
 #    git fetch origin pull/364/head:test && \	
 #    git checkout test && \
-    git checkout 1fd5465ef5658c2211e16e092c36b3bb05600730 && \
+    git checkout 20dabcbccc50f8878525677b925a4c9abcaf9f54 && \
+    sed -i 's/aioredis/aioredis==1.3.1/g' requirements.txt && \
     cp /root/dist/config.yaml /opt/tanner/tanner/data && \
     pip3 install --no-cache-dir setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \