From 3713139fc6f9bc21d654718e1b5c3416d5dea595 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Fri, 3 Jan 2020 14:06:29 +0000
Subject: [PATCH] rebuild snare, tanner

---
 docker/tanner/phpox/Dockerfile  | 6 +++---
 docker/tanner/redis/Dockerfile  | 3 ++-
 docker/tanner/snare/Dockerfile  | 7 ++++---
 docker/tanner/tanner/Dockerfile | 7 ++++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/docker/tanner/phpox/Dockerfile b/docker/tanner/phpox/Dockerfile
index 5263dfc8..61fa8c77 100644
--- a/docker/tanner/phpox/Dockerfile
+++ b/docker/tanner/phpox/Dockerfile
@@ -1,10 +1,11 @@
-FROM alpine
+FROM alpine:3.10
 #
 # Include dist
 ADD dist/ /root/dist/
 #
 # Install packages
-RUN apk -U --no-cache add \
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+    apk -U --no-cache add \
                build-base \
                file \
                git \
@@ -14,7 +15,6 @@ RUN apk -U --no-cache add \
                python3 \
                python3-dev \
                re2c && \
-    pip3 install --no-cache-dir --upgrade pip && \
 #
 # Install bfr sandbox from git
     git clone --depth=1 https://github.com/mushorg/BFR /opt/BFR && \
diff --git a/docker/tanner/redis/Dockerfile b/docker/tanner/redis/Dockerfile
index 9e3e98a9..a86215e3 100644
--- a/docker/tanner/redis/Dockerfile
+++ b/docker/tanner/redis/Dockerfile
@@ -4,7 +4,8 @@ FROM redis:alpine
 ADD dist/ /root/dist/
 #
 # Setup apt
-RUN apk -U --no-cache add redis && \ 
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+    apk -U --no-cache add redis && \ 
     cp /root/dist/redis.conf /etc && \
 #
 # Clean up
diff --git a/docker/tanner/snare/Dockerfile b/docker/tanner/snare/Dockerfile
index 69117a3a..348aec41 100644
--- a/docker/tanner/snare/Dockerfile
+++ b/docker/tanner/snare/Dockerfile
@@ -1,10 +1,11 @@
-FROM alpine
+FROM alpine:3.10
 #
 # Include dist
 ADD dist/ /root/dist/
 #
 # Setup apt
-RUN apk -U --no-cache add \
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+    apk -U --no-cache add \
                build-base \
                git \
                linux-headers \
@@ -14,7 +15,7 @@ RUN apk -U --no-cache add \
 # Setup Snare 
     git clone --depth=1 https://github.com/mushorg/snare /opt/snare && \
     cd /opt/snare/ && \
-    pip3 install --no-cache-dir --upgrade pip setuptools && \
+    pip3 install --no-cache-dir setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \
     python3 setup.py install && \
     cd / && \
diff --git a/docker/tanner/tanner/Dockerfile b/docker/tanner/tanner/Dockerfile
index d08886b3..ebddeb37 100644
--- a/docker/tanner/tanner/Dockerfile
+++ b/docker/tanner/tanner/Dockerfile
@@ -1,10 +1,11 @@
-FROM alpine
+FROM alpine:3.10
 #
 # Include dist
 ADD dist/ /root/dist/
 #
 # Setup apt
-RUN apk -U --no-cache add \
+RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
+    apk -U --no-cache add \
                build-base \
                git \
                libcap \
@@ -19,7 +20,7 @@ RUN apk -U --no-cache add \
     git clone --depth=1 https://github.com/mushorg/tanner /opt/tanner && \
     cp /root/dist/config.py /opt/tanner/tanner/ && \
     cd /opt/tanner/ && \
-    pip3 install --no-cache-dir --upgrade pip setuptools && \
+    pip3 install --no-cache-dir setuptools && \
     pip3 install --no-cache-dir -r requirements.txt && \
     python3 setup.py install && \
     rm -rf .coveragerc \