From 49502235b536c2a7525f58d1f24291f8fec9d19d Mon Sep 17 00:00:00 2001 From: Dselen Date: Fri, 23 Aug 2024 12:48:33 -0500 Subject: [PATCH] These needed to be added. --- docker/alpine/Dockerfile | 2 +- src/wgd.sh | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 6894545..cb2f3bb 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -19,7 +19,7 @@ ENV update="yes" RUN apk update \ && apk add --no-cache bash git curl tzdata \ wireguard-tools sudo \ - py3-pip py3-psutil py3-bcrypt python3-dev + py3-pip py3-psutil py3-bcrypt # 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/wireguarddashboard diff --git a/src/wgd.sh b/src/wgd.sh index a443f06..ed8e8c0 100755 --- a/src/wgd.sh +++ b/src/wgd.sh @@ -280,20 +280,7 @@ install_wgd(){ printf "[WGDashboard] Upgrading Python Package Manage (PIP)\n" { date; python3 -m pip install --upgrade pip; printf "\n\n"; } >> ./log/install.txt printf "[WGDashboard] Installing latest Python dependencies\n" - - case "$OS" in - ubuntu|debian|centos|fedora|redhat|rhel) - { date; python3 -m pip install -r requirements.txt ; printf "\n\n"; } >> ./log/install.txt #This all works on the default installation. - ;; - alpine) - { date; sudo apk add gcc python3-dev musl-dev linux-headers ; python3 -m pip install -r requirements.txt ; printf "\n\n"; } >> ./log/install.txt - ;; - *) - printf "[WGDashboard] %s Sorry, your OS is not supported. Currently the install script only support Debian-based, Red Hat-based OS. With experimental support for Alpine Linux.\n" "$heavy_crossmark" - printf "%s\n" "$helpMsg" - kill $TOP_PID - ;; - esac + { date; python3 -m pip install -r requirements.txt ; printf "\n\n"; } >> ./log/install.txt #This all works on the default installation. printf "[WGDashboard] WGDashboard installed successfully!\n" printf "[WGDashboard] Enter ./wgd.sh start to start the dashboard\n" }