Added reverted some no longer needed changes

This commit is contained in:
Dselen 2024-08-23 12:48:16 -05:00
parent 27c7e33773
commit 6e9d71fcf8
2 changed files with 8 additions and 2 deletions

View File

@ -19,7 +19,7 @@ ENV update="yes"
RUN apk update \
&& apk add --no-cache bash git curl tzdata \
wireguard-tools sudo \
py3-pip python3-dev
py3-pip py3-psutil py3-bcrypt python3-dev
# 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
@ -59,4 +59,5 @@ COPY entrypoint.sh /entrypoint.sh
# Exposing the default WireGuard Dashboard port for web access.
EXPOSE 10086
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
ENTRYPOINT [ "sleep", "infinity" ]
#ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

View File

@ -13,6 +13,11 @@ ensure_installation() {
mv /setup/app/{.[!.],}* "${WGDASH}"
python3 -m venv "${WGDASH}"/src/venv
. "${WGDASH}/src/venv/bin/activate"
# Extra step for Alpine
mv /usr/lib/python3.12/site-packages/psutil* "${WGDASH}"/src/venv/lib/python3.12/site-packages
mv /usr/lib/python3.12/site-packages/bcrypt* "${WGDASH}"/src/venv/lib/python3.12/site-packages
chmod +x "${WGDASH}"/src/wgd.sh
cd "${WGDASH}"/src || exit
./wgd.sh install