mirror of
https://github.com/donaldzou/WGDashboard.git
synced 2025-11-16 18:36:19 +00:00
refac: speed up the docker container by removing unneeded steps (#985)
Some checks failed
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (python) (push) Has been cancelled
Docker Build and Push / docker_build (push) Has been cancelled
Docker Build and Push / docker_scan (push) Has been cancelled
Mark stale issues and pull requests / stale (push) Has been cancelled
Some checks failed
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (python) (push) Has been cancelled
Docker Build and Push / docker_build (push) Has been cancelled
Docker Build and Push / docker_scan (push) Has been cancelled
Mark stale issues and pull requests / stale (push) Has been cancelled
* refac: speed up the docker container by removing unneeded steps * fix: revert compose tag --------- Co-authored-by: DaanSelen <dselen@systemec.nl>
This commit is contained in:
@@ -27,7 +27,7 @@ RUN go mod download && \
|
|||||||
go build -ldflags '-linkmode external -extldflags "-fno-PIC -static"' -v -o /usr/bin
|
go build -ldflags '-linkmode external -extldflags "-fno-PIC -static"' -v -o /usr/bin
|
||||||
#
|
#
|
||||||
# AWG TOOLS BUILDING STAGE
|
# AWG TOOLS BUILDING STAGE
|
||||||
# Base: Debian
|
# Base: Alpine
|
||||||
#
|
#
|
||||||
FROM alpine:latest AS awg-tools
|
FROM alpine:latest AS awg-tools
|
||||||
|
|
||||||
@@ -87,11 +87,8 @@ LABEL maintainer="dselen@nerthus.nl"
|
|||||||
# Install only the runtime dependencies
|
# Install only the runtime dependencies
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
iproute2 iptables \
|
iproute2 iptables \
|
||||||
bash curl \
|
bash curl procps \
|
||||||
wget unzip \
|
tzdata wireguard-tools
|
||||||
procps sudo \
|
|
||||||
tzdata wireguard-tools \
|
|
||||||
openresolv openrc
|
|
||||||
|
|
||||||
# Copy only the final binaries from the AWG builder stages
|
# Copy only the final binaries from the AWG builder stages
|
||||||
COPY --from=awg-go /usr/bin/amneziawg-go /usr/bin/amneziawg-go
|
COPY --from=awg-go /usr/bin/amneziawg-go /usr/bin/amneziawg-go
|
||||||
|
|||||||
@@ -96,14 +96,6 @@ ensure_installation() {
|
|||||||
ln -s "${config_file}" "${WGDASH}/src/wg-dashboard.ini"
|
ln -s "${config_file}" "${WGDASH}/src/wg-dashboard.ini"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create the Python virtual environment.
|
|
||||||
. "${WGDASH}/src/venv/bin/activate"
|
|
||||||
|
|
||||||
# Use the bash interpreter to install WGDashboard according to the wgd.sh script.
|
|
||||||
/bin/bash ./wgd.sh install
|
|
||||||
|
|
||||||
echo "Looks like the installation succeeded. Moving on."
|
|
||||||
|
|
||||||
# Setup WireGuard if needed
|
# Setup WireGuard if needed
|
||||||
if [ -z "$(ls -A /etc/wireguard)" ]; then
|
if [ -z "$(ls -A /etc/wireguard)" ]; then
|
||||||
cp -a "/configs/wg0.conf.template" "/etc/wireguard/wg0.conf"
|
cp -a "/configs/wg0.conf.template" "/etc/wireguard/wg0.conf"
|
||||||
@@ -196,8 +188,8 @@ start_and_monitor() {
|
|||||||
chmod 600 /dev/net/tun
|
chmod 600 /dev/net/tun
|
||||||
|
|
||||||
# Actually starting WGDashboard
|
# Actually starting WGDashboard
|
||||||
echo "Activating Python venv and executing the WireGuard Dashboard service."
|
echo "Starting WGDashboard directly with Gunicorn..."
|
||||||
bash ./wgd.sh start
|
/opt/wgdashboard/src/venv/bin/python3 ./venv/bin/gunicorn --config ./gunicorn.conf.py
|
||||||
|
|
||||||
# Wait a second before continuing, to give the python program some time to get ready.
|
# Wait a second before continuing, to give the python program some time to get ready.
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|||||||
Reference in New Issue
Block a user