Merge branch 'main' into v4.3-dev

This commit is contained in:
Donald Zou
2025-09-16 19:13:56 +08:00
parent eadae9373f
commit 18daa74ecd

View File

@@ -114,72 +114,4 @@ COPY ./docker/entrypoint.sh /entrypoint.sh
EXPOSE 10086
WORKDIR $WGDASH/src
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
##
## WGDashboard RUNNING STAGE
## Base: Debian
##
#FROM python:3.13-slim-trixie
#LABEL maintainer="dselen@nerthus.nl"
#
#RUN apt-get update \
# && apt-get install -y \
# iproute2 iptables bash curl wget unzip procps \
# sudo tzdata wireguard-tools openresolv
#
#COPY --from=awg-go /usr/bin/amneziawg-go /usr/bin/amneziawg-go
#COPY --from=awg-tools /workspace/awg-tools/src/wg /usr/bin/awg
#COPY --from=awg-tools /workspace/awg-tools/src/wg-quick/linux.bash /usr/bin/awg-quick
#
## Declaring environment variables, change Peernet to an address you like, standard is a 24 bit subnet.
#ARG wg_net="10.0.0.1" \
# wg_port="51820"
#
## Following ENV variables are changable on container runtime because /entrypoint.sh handles that. See compose.yaml for more info.
#ENV TZ="Europe/Amsterdam" \
# global_dns="9.9.9.9" \
# wgd_port="10086" \
# public_ip=""
#
## Using WGDASH -- like wg_net functionally as a ARG command. But it is needed in entrypoint.sh so it needs to be exported as environment variable.
#ENV WGDASH=/opt/wgdashboard
#
## Doing WireGuard Dashboard installation measures. Modify the git clone command to get the preferred version, with a specific branch for example.
#RUN mkdir /data \
# && mkdir /configs \
# && mkdir -p ${WGDASH}/src \
# && mkdir -p /etc/amnezia/amneziawg
#
#COPY ./src ${WGDASH}/src
#COPY --from=pip-builder /opt/wgdashboard/src/venv /opt/wgdashboard/src/venv
#RUN python3 -m venv /opt/wgdashboard/src/venv
#
## Generate basic WireGuard interface. Echoing the WireGuard interface config for readability, adjust if you want it for efficiency.
## Also setting the pipefail option, verbose: https://github.com/hadolint/hadolint/wiki/DL4006.
#SHELL ["/bin/bash", "-o", "pipefail", "-c"]
#RUN out_adapt=$(ip -o -4 route show to default | awk '{print $NF}') \
# && echo -e "[Interface]\n\
#Address = ${wg_net}/24\n\
#PrivateKey =\n\
#PostUp = iptables -t nat -I POSTROUTING 1 -s ${wg_net}/24 -o ${out_adapt} -j MASQUERADE\n\
#PostUp = iptables -I FORWARD -i wg0 -o wg0 -j DROP\n\
#PreDown = iptables -t nat -D POSTROUTING -s ${wg_net}/24 -o ${out_adapt} -j MASQUERADE\n\
#PreDown = iptables -D FORWARD -i wg0 -o wg0 -j DROP\n\
#ListenPort = ${wg_port}\n\
#SaveConfig = true\n\
#DNS = ${global_dns}" > /configs/wg0.conf.template \
# && chmod 600 /configs/wg0.conf.template
#
## Defining a way for Docker to check the health of the container. In this case: checking the gunicorn process.
#HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
# CMD sh -c 'pgrep gunicorn > /dev/null && pgrep tail > /dev/null' || exit 1
#
## Copy the basic entrypoint.sh script.
#COPY ./docker/entrypoint.sh /entrypoint.sh
#
## Exposing the default WireGuard Dashboard port for web access.
#EXPOSE 10086
#WORKDIR $WGDASH/src
#
#ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]