mirror of
https://github.com/telekom-security/tpotce.git
synced 2025-04-20 06:02:24 +00:00
bump base images
This commit is contained in:
parent
d28fcb6a22
commit
5cdf018adf
5 changed files with 9 additions and 23 deletions
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:22.04
|
FROM ubuntu:24.04
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
ENV ES_VER=8.14.2
|
ENV ES_VER=8.14.2
|
||||||
#
|
#
|
||||||
|
@ -8,6 +8,7 @@ COPY dist/ /root/dist/
|
||||||
# Install packages
|
# Install packages
|
||||||
RUN apt-get update -y && \
|
RUN apt-get update -y && \
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
|
adduser \
|
||||||
aria2 \
|
aria2 \
|
||||||
curl && \
|
curl && \
|
||||||
#
|
#
|
||||||
|
|
|
@ -32,8 +32,8 @@ RUN apk --no-cache -U add \
|
||||||
echo "xpack.reporting.roles.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
|
echo "xpack.reporting.roles.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
|
||||||
echo "elasticsearch.requestTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
|
echo "elasticsearch.requestTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
|
||||||
echo "elasticsearch.shardTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
|
echo "elasticsearch.shardTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
|
||||||
echo "kibana.autocompleteTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
|
echo "unifiedSearch.autocomplete.valueSuggestions.timeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
|
||||||
echo "kibana.autocompleteTerminateAfter: 1000000" >> /usr/share/kibana/config/kibana.yml && \
|
echo "unifiedSearch.autocomplete.valueSuggestions.terminateAfter: 1000000" >> /usr/share/kibana/config/kibana.yml && \
|
||||||
rm -rf /usr/share/kibana/optimize/bundles/* && \
|
rm -rf /usr/share/kibana/optimize/bundles/* && \
|
||||||
/usr/share/kibana/bin/kibana --optimize --allow-root && \
|
/usr/share/kibana/bin/kibana --optimize --allow-root && \
|
||||||
addgroup -g 2000 kibana && \
|
addgroup -g 2000 kibana && \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:22.04
|
FROM ubuntu:24.04
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV LS_VER=8.14.2
|
ENV LS_VER=8.14.2
|
||||||
#
|
#
|
||||||
|
@ -8,6 +8,7 @@ COPY dist/ /root/dist/
|
||||||
# Install packages
|
# Install packages
|
||||||
RUN apt-get update -y && \
|
RUN apt-get update -y && \
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
|
adduser \
|
||||||
aria2 \
|
aria2 \
|
||||||
bash \
|
bash \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM alpine:3.19
|
FROM alpine:3.20
|
||||||
#
|
#
|
||||||
# Install packages
|
# Install packages
|
||||||
RUN apk --no-cache -U add \
|
RUN apk --no-cache -U add \
|
||||||
|
|
|
@ -16,27 +16,11 @@ RUN apk -U add --no-cache \
|
||||||
make && \
|
make && \
|
||||||
mv /opt/endlessh/endlessh /root/dist
|
mv /opt/endlessh/endlessh /root/dist
|
||||||
#
|
#
|
||||||
FROM alpine:3.19
|
FROM alpine:3.20
|
||||||
#
|
#
|
||||||
COPY --from=builder /root/dist/* /opt/endlessh/
|
COPY --from=builder /root/dist/* /opt/endlessh/
|
||||||
#
|
#
|
||||||
# Install packages
|
|
||||||
RUN apk -U add --no-cache \
|
|
||||||
libcap && \
|
|
||||||
#
|
|
||||||
# Setup user, groups and configs
|
|
||||||
mkdir -p /var/log/endlessh && \
|
|
||||||
addgroup -g 2000 endlessh && \
|
|
||||||
adduser -S -H -s /bin/ash -u 2000 -D -g 2000 endlessh && \
|
|
||||||
chown -R endlessh:endlessh /opt/endlessh && \
|
|
||||||
#setcap cap_net_bind_service=+ep /usr/bin/python3.8 && \
|
|
||||||
#
|
|
||||||
# Clean up
|
|
||||||
rm -rf /root/* \
|
|
||||||
/var/cache/apk/*
|
|
||||||
#
|
|
||||||
# Set workdir and start endlessh
|
|
||||||
STOPSIGNAL SIGINT
|
STOPSIGNAL SIGINT
|
||||||
USER endlessh:endlessh
|
USER 2000:2000
|
||||||
WORKDIR /opt/endlessh/
|
WORKDIR /opt/endlessh/
|
||||||
CMD ./endlessh -f endlessh.conf >/var/log/endlessh/endlessh.log
|
CMD ./endlessh -f endlessh.conf >/var/log/endlessh/endlessh.log
|
||||||
|
|
Loading…
Reference in a new issue