Bump to Alpine 3.16 for most of the images.

Glutton, Heralding, Mailoney and Snare/Tanner need work.
This commit is contained in:
t3chn0m4g3 2022-06-02 15:47:17 +00:00
parent 409e4bde3e
commit 09c682cd7b
20 changed files with 32 additions and 28 deletions

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/

View file

@ -1,5 +1,8 @@
version: '2.3' version: '2.3'
networks:
ciscoasa_local:
services: services:
# Ciscoasa service # Ciscoasa service

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Install packages # Install packages
RUN apk --no-cache -U add \ RUN apk --no-cache -U add \
@ -28,7 +28,7 @@ RUN apk --no-cache -U add \
addgroup -g 2000 citrixhoneypot && \ addgroup -g 2000 citrixhoneypot && \
adduser -S -H -s /bin/ash -u 2000 -D -g 2000 citrixhoneypot && \ adduser -S -H -s /bin/ash -u 2000 -D -g 2000 citrixhoneypot && \
chown -R citrixhoneypot:citrixhoneypot /opt/citrixhoneypot && \ chown -R citrixhoneypot:citrixhoneypot /opt/citrixhoneypot && \
setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \ setcap cap_net_bind_service=+ep /usr/bin/python3.10 && \
# #
# Clean up # Clean up
apk del --purge git \ apk del --purge git \

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/
@ -62,13 +62,13 @@ RUN apk --no-cache -U add \
pip3 install --no-cache-dir . && \ pip3 install --no-cache-dir . && \
cd / && \ cd / && \
rm -rf /opt/conpot /tmp/* /var/tmp/* && \ rm -rf /opt/conpot /tmp/* /var/tmp/* && \
setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \ setcap cap_net_bind_service=+ep /usr/bin/python3.10 && \
# #
# Get wireshark manuf db for scapy, setup configs, user, groups # Get wireshark manuf db for scapy, setup configs, user, groups
mkdir -p /etc/conpot /var/log/conpot /usr/share/wireshark && \ mkdir -p /etc/conpot /var/log/conpot /usr/share/wireshark && \
wget https://github.com/wireshark/wireshark/raw/master/manuf -o /usr/share/wireshark/manuf && \ wget https://github.com/wireshark/wireshark/raw/master/manuf -o /usr/share/wireshark/manuf && \
cp /root/dist/conpot.cfg /etc/conpot/conpot.cfg && \ cp /root/dist/conpot.cfg /etc/conpot/conpot.cfg && \
cp -R /root/dist/templates /usr/lib/python3.9/site-packages/conpot/ && \ cp -R /root/dist/templates /usr/lib/python3.10/site-packages/conpot/ && \
addgroup -g 2000 conpot && \ addgroup -g 2000 conpot && \
adduser -S -s /bin/ash -u 2000 -D -g 2000 conpot && \ adduser -S -s /bin/ash -u 2000 -D -g 2000 conpot && \
# #

View file

@ -3,7 +3,7 @@ sensorid = conpot
[virtual_file_system] [virtual_file_system]
data_fs_url = %(CONPOT_TMP)s data_fs_url = %(CONPOT_TMP)s
fs_url = tar:///usr/lib/python3.9/site-packages/conpot/data.tar fs_url = tar:///usr/lib/python3.10/site-packages/conpot/data.tar
[session] [session]
timeout = 30 timeout = 30

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/
@ -40,9 +40,10 @@ RUN apk --no-cache -U add \
# Install cowrie # Install cowrie
mkdir -p /home/cowrie && \ mkdir -p /home/cowrie && \
cd /home/cowrie && \ cd /home/cowrie && \
git clone --depth=1 https://github.com/micheloosterhof/cowrie -b v2.3.0 && \ #git clone --depth=1 https://github.com/cowrie/cowrie -b v2.3.0 && \
git clone --depth=1 https://github.com/cowrie/cowrie && \
cd cowrie && \ cd cowrie && \
# git checkout 6b1e82915478292f1e77ed776866771772b48f2e && \ git checkout 8b1e1cf4db0d3b0e70b470cf40385bbbd3ed1733 && \
mkdir -p log && \ mkdir -p log && \
cp /root/dist/requirements.txt . && \ cp /root/dist/requirements.txt . && \
pip3 install --upgrade pip && \ pip3 install --upgrade pip && \

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/
@ -41,7 +41,7 @@ RUN apk --no-cache -U add \
sed -i "s#rotate_size = 10#rotate_size = 9999#g" /opt/ddospot/ddospot/pots/ssdp/ssdpot.conf && \ sed -i "s#rotate_size = 10#rotate_size = 9999#g" /opt/ddospot/ddospot/pots/ssdp/ssdpot.conf && \
cp /root/dist/requirements.txt . && \ cp /root/dist/requirements.txt . && \
pip3 install -r ddospot/requirements.txt && \ pip3 install -r ddospot/requirements.txt && \
setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \ setcap cap_net_bind_service=+ep /usr/bin/python3.10 && \
# #
# Setup user, groups and configs # Setup user, groups and configs
addgroup -g 2000 ddospot && \ addgroup -g 2000 ddospot && \

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Setup apk # Setup apk
RUN apk -U add --no-cache \ RUN apk -U add --no-cache \

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/

View file

@ -16,7 +16,7 @@ RUN apk -U add --no-cache \
make && \ make && \
mv /opt/endlessh/endlessh /root/dist mv /opt/endlessh/endlessh /root/dist
# #
FROM alpine:3.15 FROM alpine:3.16
# #
COPY --from=builder /root/dist/* /opt/endlessh/ COPY --from=builder /root/dist/* /opt/endlessh/
# #

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Get and install dependencies & packages # Get and install dependencies & packages
RUN apk -U --no-cache add \ RUN apk -U --no-cache add \

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/
@ -58,7 +58,7 @@ RUN apk -U --no-cache add \
cp /root/dist/setup.py . && \ cp /root/dist/setup.py . && \
pip3 install --upgrade pip && \ pip3 install --upgrade pip && \
pip3 install . && \ pip3 install . && \
setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \ setcap cap_net_bind_service=+ep /usr/bin/python3.10 && \
# #
# Setup user, groups and configs # Setup user, groups and configs
addgroup -g 2000 honeypots && \ addgroup -g 2000 honeypots && \

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/
@ -37,7 +37,7 @@ RUN apk -U --no-cache add \
git checkout 7ab1cac437baba17cb2cd25d5bb1400327e1bb79 && \ git checkout 7ab1cac437baba17cb2cd25d5bb1400327e1bb79 && \
cp /root/dist/requirements.txt . && \ cp /root/dist/requirements.txt . && \
pip3 install -r requirements.txt && \ pip3 install -r requirements.txt && \
setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \ setcap cap_net_bind_service=+ep /usr/bin/python3.10 && \
# #
# Setup user, groups and configs # Setup user, groups and configs
addgroup -g 2000 ipphoney && \ addgroup -g 2000 ipphoney && \

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Setup apk # Setup apk
RUN apk -U --no-cache add \ RUN apk -U --no-cache add \

View file

@ -1,6 +1,6 @@
# In case of problems Alpine 3.13 needs to be used: # In case of problems Alpine 3.13 needs to be used:
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2 # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
FROM alpine:3.15 FROM alpine:3.16
# #
# Add source # Add source
COPY . /opt/p0f COPY . /opt/p0f

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/
@ -27,7 +27,7 @@ RUN apk -U --no-cache add \
# cp /root/dist/views.py /opt/wordpot2/wordpot/views.py && \ # cp /root/dist/views.py /opt/wordpot2/wordpot/views.py && \
cp /root/dist/requirements.txt . && \ cp /root/dist/requirements.txt . && \
pip3 install -r requirements.txt && \ pip3 install -r requirements.txt && \
setcap cap_net_bind_service=+ep /usr/bin/python3.9 && \ setcap cap_net_bind_service=+ep /usr/bin/python3.10 && \
# #
# Setup user, groups and configs # Setup user, groups and configs
addgroup -g 2000 wordpot && \ addgroup -g 2000 wordpot && \