diff --git a/docker/tanner/docker-compose.yml b/docker/tanner/docker-compose.yml index 5f272a2a..76725815 100644 --- a/docker/tanner/docker-compose.yml +++ b/docker/tanner/docker-compose.yml @@ -51,25 +51,25 @@ services: - tanner_redis # Tanner WEB Service - tanner_web: - build: ./tanner - container_name: tanner_web - restart: always - stop_signal: SIGKILL - tmpfs: - - /tmp/tanner:uid=2000,gid=2000 - tty: true - networks: - - tanner_local +# tanner_web: +# build: ./tanner +# container_name: tanner_web +# restart: always +# stop_signal: SIGKILL +# tmpfs: +# - /tmp/tanner:uid=2000,gid=2000 +# tty: true +# networks: +# - tanner_local # ports: # - "127.0.0.1:8091:8091" - image: "dtagdevsec/tanner:2203" - command: tannerweb - read_only: true - volumes: - - /data/tanner/log:/var/log/tanner - depends_on: - - tanner_redis +# image: "dtagdevsec/tanner:2203" +# command: tannerweb +# read_only: true +# volumes: +# - /data/tanner/log:/var/log/tanner +# depends_on: +# - tanner_redis # Tanner Service tanner: @@ -90,7 +90,7 @@ services: - /data/tanner/files:/opt/tanner/files depends_on: - tanner_api - - tanner_web +# - tanner_web - tanner_phpox # Snare Service diff --git a/docker/tanner/phpox/Dockerfile b/docker/tanner/phpox/Dockerfile index 59fa7184..0acf496b 100644 --- a/docker/tanner/phpox/Dockerfile +++ b/docker/tanner/phpox/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13 +FROM alpine:3.15 # # Install packages RUN apk -U --no-cache add \ diff --git a/docker/tanner/snare/Dockerfile b/docker/tanner/snare/Dockerfile index 0157f6bb..a737a5f2 100644 --- a/docker/tanner/snare/Dockerfile +++ b/docker/tanner/snare/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 # # Include dist ADD dist/ /root/dist/ @@ -36,4 +36,5 @@ RUN apk -U --no-cache add \ # # Start snare STOPSIGNAL SIGKILL -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 --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 3b676dfc..22750dc3 100644 --- a/docker/tanner/tanner/Dockerfile +++ b/docker/tanner/tanner/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13 +FROM alpine:3.15 # # Include dist ADD dist/ /root/dist/ @@ -21,9 +21,10 @@ RUN apk -U --no-cache add \ cd /opt/tanner/ && \ # git fetch origin pull/364/head:test && \ # git checkout test && \ - git checkout 20dabcbccc50f8878525677b925a4c9abcaf9f54 && \ - sed -i 's/aioredis/aioredis==1.3.1/g' requirements.txt && \ - sed -i 's/^aiohttp$/aiohttp==3.7.4/g' requirements.txt && \ +# git checkout 20dabcbccc50f8878525677b925a4c9abcaf9f54 && \ + git checkout 2fdce2e2ad7e125012c7e6dcbfa02b50f73c128e && \ +# sed -i 's/aioredis/aioredis==1.3.1/g' requirements.txt && \ +# sed -i 's/^aiohttp$/aiohttp==3.7.4/g' requirements.txt && \ cp /root/dist/config.yaml /opt/tanner/tanner/data && \ pip3 install --ignore-installed packaging && \ pip3 install --no-cache-dir setuptools && \