bump tanner to latest master, alpine 3.15

This commit is contained in:
t3chn0m4g3 2022-01-20 17:47:29 +00:00
parent 2586e10285
commit 66b4ef047a
4 changed files with 27 additions and 25 deletions

View file

@ -51,25 +51,25 @@ services:
- tanner_redis - tanner_redis
# Tanner WEB Service # Tanner WEB Service
tanner_web: # tanner_web:
build: ./tanner # build: ./tanner
container_name: tanner_web # container_name: tanner_web
restart: always # restart: always
stop_signal: SIGKILL # stop_signal: SIGKILL
tmpfs: # tmpfs:
- /tmp/tanner:uid=2000,gid=2000 # - /tmp/tanner:uid=2000,gid=2000
tty: true # tty: true
networks: # networks:
- tanner_local # - tanner_local
# ports: # ports:
# - "127.0.0.1:8091:8091" # - "127.0.0.1:8091:8091"
image: "dtagdevsec/tanner:2203" # image: "dtagdevsec/tanner:2203"
command: tannerweb # command: tannerweb
read_only: true # read_only: true
volumes: # volumes:
- /data/tanner/log:/var/log/tanner # - /data/tanner/log:/var/log/tanner
depends_on: # depends_on:
- tanner_redis # - tanner_redis
# Tanner Service # Tanner Service
tanner: tanner:
@ -90,7 +90,7 @@ services:
- /data/tanner/files:/opt/tanner/files - /data/tanner/files:/opt/tanner/files
depends_on: depends_on:
- tanner_api - tanner_api
- tanner_web # - tanner_web
- tanner_phpox - tanner_phpox
# Snare Service # Snare Service

View file

@ -1,4 +1,4 @@
FROM alpine:3.13 FROM alpine:3.15
# #
# Install packages # Install packages
RUN apk -U --no-cache add \ RUN apk -U --no-cache add \

View file

@ -1,4 +1,4 @@
FROM alpine:3.14 FROM alpine:3.15
# #
# Include dist # Include dist
ADD dist/ /root/dist/ ADD dist/ /root/dist/
@ -36,4 +36,5 @@ RUN apk -U --no-cache add \
# #
# Start snare # Start snare
STOPSIGNAL SIGKILL 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)

View file

@ -1,4 +1,4 @@
FROM alpine:3.13 FROM alpine:3.15
# #
# Include dist # Include dist
ADD dist/ /root/dist/ ADD dist/ /root/dist/
@ -21,9 +21,10 @@ RUN apk -U --no-cache add \
cd /opt/tanner/ && \ cd /opt/tanner/ && \
# git fetch origin pull/364/head:test && \ # git fetch origin pull/364/head:test && \
# git checkout test && \ # git checkout test && \
git checkout 20dabcbccc50f8878525677b925a4c9abcaf9f54 && \ # git checkout 20dabcbccc50f8878525677b925a4c9abcaf9f54 && \
sed -i 's/aioredis/aioredis==1.3.1/g' requirements.txt && \ git checkout 2fdce2e2ad7e125012c7e6dcbfa02b50f73c128e && \
sed -i 's/^aiohttp$/aiohttp==3.7.4/g' requirements.txt && \ # 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 && \ cp /root/dist/config.yaml /opt/tanner/tanner/data && \
pip3 install --ignore-installed packaging && \ pip3 install --ignore-installed packaging && \
pip3 install --no-cache-dir setuptools && \ pip3 install --no-cache-dir setuptools && \