Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-04-20 06:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bump SentryPeer to 1.4.1

Browse source
This commit is contained in:
t3chn0m4g3 2022-06-02 08:31:18 +00:00
parent 73b54f5504
commit aaef85c49d
7 changed files with 27 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
docker/sentrypeer/Dockerfile
View file

@ -1,59 +1,14 @@
FROM alpine:3.15 as builder FROM alpine:edge
#
RUN apk -U add --no-cache \
autoconf \
automake \
autoconf-archive \
build-base \
curl-dev \
cmocka-dev \
git \
jansson-dev \
libmicrohttpd-dev \
pcre2-dev \
sqlite-dev \
util-linux-dev
#
RUN apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
libosip2-dev
#
# Download SentryPeer sources and build
RUN git clone https://github.com/SentryPeer/SentryPeer -b v1.2.0
#
WORKDIR /SentryPeer
#
RUN ./bootstrap.sh
RUN ./configure --disable-opendht --disable-zyre
RUN make
RUN make check
RUN make install
#RUN tar cvfz sp.tgz /SentryPeer/* && \
# mv sp.tgz /
#
FROM alpine:3.15
#
#COPY --from=builder /sp.tgz /root
COPY --from=builder /SentryPeer/sentrypeer /opt/sentrypeer/
# #
# Install packages # Install packages
RUN apk -U add --no-cache \ RUN apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
jansson \ sentrypeer && \
libmicrohttpd \
libuuid \
pcre2 \
sqlite-libs && \
apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
libosip2 && \
#
# Extract from builder
# mkdir /opt/sentrypeer && \
# tar xvfz /root/sp.tgz --strip-components=1 -C /opt/sentrypeer/ && \
# #
# Setup user, groups and configs # Setup user, groups and configs
mkdir -p /var/log/sentrypeer && \ mkdir -p /var/log/sentrypeer && \
addgroup -g 2000 sentrypeer && \ addgroup -g 2000 sentrypeer && \
adduser -S -H -s /bin/ash -u 2000 -D -g 2000 sentrypeer && \ adduser -S -H -s /bin/ash -u 2000 -D -g 2000 sentrypeer && \
chown -R sentrypeer:sentrypeer /opt/sentrypeer && \ chown -R sentrypeer:sentrypeer /usr/bin/sentrypeer && \
# #
# Clean up # Clean up
rm -rf /root/* && \ rm -rf /root/* && \
@ -62,5 +17,4 @@ RUN apk -U add --no-cache \
# Set workdir and start sentrypeer # Set workdir and start sentrypeer
STOPSIGNAL SIGKILL STOPSIGNAL SIGKILL
USER sentrypeer:sentrypeer USER sentrypeer:sentrypeer
WORKDIR /opt/sentrypeer/ CMD /usr/bin/sentrypeer -warpj -f /var/log/sentrypeer/sentrypeer.db -l /var/log/sentrypeer/sentrypeer.json
CMD ./sentrypeer -jar -f /var/log/sentrypeer/sentrypeer.db -l /var/log/sentrypeer/sentrypeer.json

54
docker/sentrypeer/Dockerfile.alpine.keep
View file

@ -1,66 +1,39 @@
FROM alpine:3.15 as builder FROM alpine:3.16 as builder
# #
RUN apk -U add --no-cache \ RUN apk -U add --no-cache \
argon2-dev \
autoconf \ autoconf \
automake \ automake \
autoconf-archive \ autoconf-archive \
build-base \ build-base \
curl-dev \ curl-dev \
cmocka-dev \ cmocka-dev \
czmq-dev \
git \ git \
jansson-dev \ jansson-dev \
libtool \
libmicrohttpd-dev \ libmicrohttpd-dev \
pcre2-dev \ pcre2-dev \
readline-dev \
sqlite-dev \ sqlite-dev \
util-linux-dev \ util-linux-dev
zeromq-dev
# #
RUN apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ RUN apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
libosip2-dev libosip2-dev \
RUN apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/community \ opendht-dev
asio-dev \
msgpack-c-dev \
msgpack-cxx-dev
#
# Download and build Zyre
WORKDIR /tmp
RUN git clone https://github.com/savoirfairelinux/opendht dht
WORKDIR /tmp/dht
RUN ./autogen.sh
RUN ./configure
RUN make
RUN make install
RUN ldconfig /etc/ld.so.conf.d
#
WORKDIR /tmp
RUN git clone --quiet https://github.com/zeromq/zyre zyre
WORKDIR /tmp/zyre
RUN ./autogen.sh 2> /dev/null
RUN ./configure --quiet --without-docs
RUN make
RUN make install
RUN ldconfig /etc/ld.so.conf.d
# #
# Download SentryPeer sources and build # Download SentryPeer sources and build
WORKDIR / RUN git clone https://github.com/SentryPeer/SentryPeer -b v1.4.1
RUN git clone https://github.com/SentryPeer/SentryPeer.git
# #
WORKDIR /SentryPeer WORKDIR /SentryPeer
# #
RUN cp -R /tmp/dht/* . RUN sed -i '/AM_LDFLAGS=/d' Makefile.am
RUN ./bootstrap.sh RUN ./bootstrap.sh
#RUN ./configure --disable-opendht --disable-zyre
RUN ./configure RUN ./configure
RUN make CPPFLAGS=-D_POSIX_C_SOURCE=199309L RUN make
RUN make check RUN make check
RUN make install RUN make install
RUN tar cvfz sp.tgz /SentryPeer/* && \ #RUN tar cvfz sp.tgz /SentryPeer/* && \
mv sp.tgz / # mv sp.tgz /
# #
FROM alpine:3.15 FROM alpine:3.16
# #
#COPY --from=builder /sp.tgz /root #COPY --from=builder /sp.tgz /root
COPY --from=builder /SentryPeer/sentrypeer /opt/sentrypeer/ COPY --from=builder /SentryPeer/sentrypeer /opt/sentrypeer/
@ -73,7 +46,8 @@ RUN apk -U add --no-cache \
pcre2 \ pcre2 \
sqlite-libs && \ sqlite-libs && \
apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \ apk -U add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
libosip2 && \ libosip2 \
opendht-libs && \
# #
# Extract from builder # Extract from builder
# mkdir /opt/sentrypeer && \ # mkdir /opt/sentrypeer && \
@ -93,4 +67,4 @@ RUN apk -U add --no-cache \
STOPSIGNAL SIGKILL STOPSIGNAL SIGKILL
USER sentrypeer:sentrypeer USER sentrypeer:sentrypeer
WORKDIR /opt/sentrypeer/ WORKDIR /opt/sentrypeer/
CMD ./sentrypeer -draws CMD ./sentrypeer -warpj -f /var/log/sentrypeer/sentrypeer.db -l /var/log/sentrypeer/sentrypeer.json

95
docker/sentrypeer/Dockerfile.debian.keep
View file

@ -1,95 +0,0 @@
FROM debian:bullseye as builder
ENV DEBIAN_FRONTEND noninteractive
#
RUN apt-get update
RUN apt-get dist-upgrade -y \
autoconf \
automake \
autoconf-archive \
build-essential \
git \
libcmocka-dev \
libcurl4-gnutls-dev \
libczmq-dev \
libjansson-dev \
libmicrohttpd-dev \
libopendht-dev \
libosip2-dev \
libpcre2-dev \
libsqlite3-dev \
libtool
#
# Download and build OpenDHT
WORKDIR /tmp
RUN git clone https://github.com/savoirfairelinux/opendht opendht
WORKDIR /tmp/opendht
RUN ./autogen.sh
RUN ./configure
RUN make
RUN make install
RUN ldconfig
#
# Download and build Zyre
WORKDIR /tmp
RUN git clone https://github.com/zeromq/zyre -b v2.0.1 zyre
WORKDIR /tmp/zyre
RUN ./autogen.sh
RUN ./configure --without-docs
RUN make
RUN make install
RUN ldconfig
#
# Download and build SentryPeer
WORKDIR /
RUN git clone https://github.com/SentryPeer/SentryPeer -b v1.0.0
#
WORKDIR /SentryPeer
#
RUN cp -r /tmp/opendht .
RUN ./bootstrap.sh
RUN ./configure
RUN make
RUN make check
RUN make install
#RUN tar cvfz sp.tgz /SentryPeer/* && \
# mv sp.tgz /
#RUN exit 1
#
FROM debian:bullseye
#
#COPY --from=builder /sp.tgz /root
COPY --from=builder /SentryPeer/sentrypeer /opt/sentrypeer/
#
# Install packages
RUN apt-get update && \
apt-get dist-upgrade -y && \
apt-get install -y \
libcmocka0 \
libcurl4 \
libczmq4 \
libjansson4 \
libmicrohttpd12 \
libosip2-11 \
libsqlite3-0 \
pcre2-utils && \
#
# Extract from builder
# mkdir /opt/sentrypeer && \
# tar xvfz /root/sp.tgz --strip-components=1 -C /opt/sentrypeer/ && \
#
# Setup user, groups and configs
mkdir -p /var/log/sentrypeer && \
addgroup --gid 2000 sentrypeer && \
adduser --system --no-create-home --shell /bin/bash --uid 2000 --disabled-password --disabled-login --gid 2000 sentrypeer && \
chown -R sentrypeer:sentrypeer /opt/sentrypeer && \
#
# Clean up
rm -rf /root/* && \
apt-get autoremove -y --purge && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
#
# Set workdir and start sentrypeer
STOPSIGNAL SIGKILL
USER sentrypeer:sentrypeer
WORKDIR /opt/sentrypeer/
CMD ./sentrypeer -draws

3
docker/sentrypeer/docker-compose.yml
View file

@ -15,8 +15,9 @@ services:
networks: networks:
- sentrypeer_local - sentrypeer_local
ports: ports:
- "4222:4222/udp"
- "5060:5060/udp" - "5060:5060/udp"
# - "127.0.0.1:8082:8082" - "127.0.0.1:8082:8082"
image: "dtagdevsec/sentrypeer:2204" image: "dtagdevsec/sentrypeer:2204"
read_only: true read_only: true
volumes: volumes:

2
etc/compose/hive_sensor.yml
View file

@ -377,7 +377,9 @@ services:
networks: networks:
- sentrypeer_local - sentrypeer_local
ports: ports:
# - "4222:4222/udp"
- "5060:5060/udp" - "5060:5060/udp"
# - "127.0.0.1:8082:8082"
image: "dtagdevsec/sentrypeer:2204" image: "dtagdevsec/sentrypeer:2204"
read_only: true read_only: true
volumes: volumes:

2
etc/compose/sensor.yml
View file

@ -377,7 +377,9 @@ services:
networks: networks:
- sentrypeer_local - sentrypeer_local
ports: ports:
# - "4222:4222/udp"
- "5060:5060/udp" - "5060:5060/udp"
# - "127.0.0.1:8082:8082"
image: "dtagdevsec/sentrypeer:2204" image: "dtagdevsec/sentrypeer:2204"
read_only: true read_only: true
volumes: volumes:

2
etc/compose/standard.yml
View file

@ -377,7 +377,9 @@ services:
networks: networks:
- sentrypeer_local - sentrypeer_local
ports: ports:
# - "4222:4222/udp"
- "5060:5060/udp" - "5060:5060/udp"
# - "127.0.0.1:8082:8082"
image: "dtagdevsec/sentrypeer:2204" image: "dtagdevsec/sentrypeer:2204"
read_only: true read_only: true
volumes: volumes: