Compare commits

..

1 commit

Author SHA1 Message Date
hand7s
90f3081388
Merge 0512949f23 into ddc2cfacb9 2024-12-03 23:15:04 +01:00

View file

@ -1,14 +1,12 @@
# ======================================================== # ========================================================
# Stage: Builder # Stage: Builder
# ======================================================== # ========================================================
FROM golang:1.23-alpine AS builder FROM golang:1.23-bookworm AS builder
# because builder doesn't matter as i've tested recently
WORKDIR /app WORKDIR /app
ARG TARGETARCH ARG TARGETARCH
RUN apk --no-cache --update add \ RUN apt-get update -y
build-base \ RUN apt-get install -y \
gcc \ gcc \
wget \ wget \
unzip unzip
@ -23,16 +21,12 @@ RUN ./DockerInit.sh "$TARGETARCH"
# ======================================================== # ========================================================
# Stage: Final Image of 3x-ui # Stage: Final Image of 3x-ui
# ======================================================== # ========================================================
FROM ubuntu:devel FROM ubuntu:rolling
# while being techniacally newer "devel" image proven to be more stable and more lightweight
ENV TZ=Asia/Tehran ENV TZ=Asia/Tehran
WORKDIR /app WORKDIR /app
RUN apt-get update -y RUN apt-get update -y
RUN apt-get install -y \ RUN apt-get install -y \
--no-install-recommends \
# to make image less "bloated" due of way apt works
ca-certificates \
tzdata \ tzdata \
fail2ban \ fail2ban \
bash bash
@ -43,7 +37,7 @@ COPY --from=builder /app/x-ui.sh /usr/bin/x-ui
# Configure fail2ban # Configure fail2ban
RUN rm -f /etc/fail2ban/jail.d/alpine-ssh.conf \ RUN rm -f /etc/fail2ban/jail.d/*.conf \
&& cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local \ && cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local \
&& sed -i "s/^\[ssh\]$/&\nenabled = false/" /etc/fail2ban/jail.local \ && sed -i "s/^\[ssh\]$/&\nenabled = false/" /etc/fail2ban/jail.local \
&& sed -i "s/^\[sshd\]$/&\nenabled = false/" /etc/fail2ban/jail.local \ && sed -i "s/^\[sshd\]$/&\nenabled = false/" /etc/fail2ban/jail.local \