From 2b3a45c800f96f359c448d36911b87a226b8b951 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Thu, 5 Dec 2024 19:32:20 +0100
Subject: [PATCH] tweaking
---
docker/tanner/phpox/Dockerfile | 8 ++++----
docker/tanner/redis/Dockerfile | 5 +++--
docker/tanner/snare/Dockerfile | 6 ++----
docker/tanner/tanner/Dockerfile | 6 +++---
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/docker/tanner/phpox/Dockerfile b/docker/tanner/phpox/Dockerfile
index eb4f0620..72ab79a2 100644
--- a/docker/tanner/phpox/Dockerfile
+++ b/docker/tanner/phpox/Dockerfile
@@ -1,7 +1,8 @@
-FROM alpine:3.19
+FROM alpine:3.20
#
# Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+ apk --no-cache -U add \
build-base \
file \
git \
@@ -16,7 +17,6 @@ RUN apk --no-cache -U add \
# Install bfr sandbox from git
git clone https://github.com/mushorg/BFR -b v1.0.0 /opt/BFR && \
cd /opt/BFR && \
-# git checkout 91a8a4e155875c50b69d5c6af454e304994815a7 && \
phpize83 && \
./configure \
--with-php-config=/usr/bin/php-config83 \
@@ -30,7 +30,7 @@ RUN apk --no-cache -U add \
# Install PHP Sandbox
git clone https://github.com/mushorg/phpox /opt/phpox && \
cd /opt/phpox && \
- #git checkout a62c8136ec7b3ebab0c989f4235e2960175121f8 && \
+ git checkout 55a6cbdc2c62f08eb45acffaf84f23f06a1d4703 && \
make && \
#
# Clean up
diff --git a/docker/tanner/redis/Dockerfile b/docker/tanner/redis/Dockerfile
index 91579152..2bd89f6d 100644
--- a/docker/tanner/redis/Dockerfile
+++ b/docker/tanner/redis/Dockerfile
@@ -1,10 +1,11 @@
-FROM alpine:3.19
+FROM alpine:3.20
#
# Include dist
COPY dist/ /root/dist/
#
# Install packages
-RUN apk --no-cache -U add redis shadow && \
+RUN apk --no-cache -U upgrade && \
+ apk --no-cache -U add redis shadow && \
cp /root/dist/redis.conf /etc && \
#
# Setup user and group
diff --git a/docker/tanner/snare/Dockerfile b/docker/tanner/snare/Dockerfile
index dd5e3657..5c3c201b 100644
--- a/docker/tanner/snare/Dockerfile
+++ b/docker/tanner/snare/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.19
COPY dist/ /root/dist/
#
# Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+ apk --no-cache -U add \
build-base \
git \
linux-headers \
@@ -23,7 +24,6 @@ RUN apk --no-cache -U add \
# Setup Snare
git clone https://github.com/mushorg/snare /opt/snare && \
cd /opt/snare/ && \
- # git checkout 0919a80838eb0823a3b7029b0264628ee0a36211 && \
git checkout 08c69b7165354ea2040b6170c37d92ff3c304f96 && \
cp /root/dist/requirements.txt . && \
pip3 install --break-system-packages --no-cache-dir -r requirements.txt && \
@@ -31,7 +31,6 @@ RUN apk --no-cache -U add \
cd / && \
rm -rf /opt/snare && \
mkdir -p /opt/snare/pages && \
-# clone --target http://example.com && \
mv /root/dist/pages/* /opt/snare/pages/ && \
#
# Setup configs, user, groups
@@ -52,5 +51,4 @@ RUN apk --no-cache -U add \
# Start snare
STOPSIGNAL SIGKILL
USER snare:snare
-#CMD snare --tanner tanner --debug true --no-dorks true --auto-update false --host-ip 0.0.0.0 --port 80 --page-dir $(shuf -i 1-10 -n 1)
CMD snare --tanner tanner --debug true --auto-update false --host-ip 0.0.0.0 --port 80 --page-dir $(shuf -i 1-10 -n 1)
diff --git a/docker/tanner/tanner/Dockerfile b/docker/tanner/tanner/Dockerfile
index 4c2566a4..bddf8dc1 100644
--- a/docker/tanner/tanner/Dockerfile
+++ b/docker/tanner/tanner/Dockerfile
@@ -4,7 +4,8 @@ FROM alpine:3.17
COPY dist/ /root/dist/
#
# Install packages
-RUN apk --no-cache -U add \
+RUN apk --no-cache -U upgrade && \
+ apk --no-cache -U add \
build-base \
git \
libcap \
@@ -31,7 +32,6 @@ RUN apk --no-cache -U add \
python3-dev && \
#
# Setup Tanner
-# git clone https://github.com/t3chn0m4g3/tanner /opt/tanner && \
git clone https://github.com/mushorg/tanner /opt/tanner && \
cd /opt/tanner/ && \
git checkout 245d628f4023e5462c7035e760a6b5eed0a33fbe && \
@@ -64,7 +64,7 @@ RUN apk --no-cache -U add \
git \
libcap \
libffi-dev \
-# libressl-dev \
+ openssl-dev \
linux-headers \
python3-dev && \
rm -rf /root/* \