fix: Docker autostart issue due to invalid resolvectl (#1053)

* Update funding information in FUNDING.yml

* Update README.md

* refac: refactor the logic with which the Docker container links its files to the volume

* fix: 1032 docker autostart issue

---------

Co-authored-by: Donald Zou <donaldzou@live.hk>
Co-authored-by: DaanSelen <dselen@systemec.nl>

.dockerignore

@@ -3,3 +3,5 @@
 *.md
 tests/
 docs/
+src/db
+src/wg-dashboard.ini

.github/FUNDING.yml

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
-github: [donaldzou]
+github: [WGDashboard]
-patreon: DonaldDonnyZou
+open_collective: wgdashboard

README.md

@@ -51,7 +51,7 @@
   You can support via <br>
 </p>
 <p align="center">
-  <a align="center" href="https://github.com/sponsors/donaldzou" target="_blank"><img src="https://img.shields.io/badge/GitHub%20Sponsor-2e9a40?style=for-the-badge&logo=github"></a>
+  <a align="center" href="https://github.com/sponsors/WGDashboard" target="_blank"><img src="https://img.shields.io/badge/GitHub%20Sponsor-2e9a40?style=for-the-badge&logo=github"></a>
   <a align="center" href="https://buymeacoffee.com/donaldzou" target="_blank"><img src="https://img.shields.io/badge/Buy%20me%20a%20coffee-ffdd00?style=for-the-badge&logo=buymeacoffee&logoColor=000000"></a>
   <a align="center" href="https://patreon.com/c/DonaldDonnyZou/membership" target="_blank"><img src="https://img.shields.io/badge/Patreon-000000?style=for-the-badge&logo=patreon&logoColor=ffffff"></a>
 </p>

docker/compose.yaml

@@ -13,6 +13,7 @@ services:
     # By default its all disabled, but uncomment the following lines to apply these. (uncommenting is removing the # character)
     # Refer to the documentation on https://wgdashboard.dev/ for more info on what everything means.
     #environment:
+      #- wg_autostart=wg0
       #- tz=                # <--- Set container timezone, default: Europe/Amsterdam.
       #- public_ip=         # <--- Set public IP to ensure the correct one is chosen, defaulting to the IP give by ifconfig.me.
       #- wgd_port=          # <--- Set the port WGDashboard will use for its web-server.

docker/entrypoint.sh

@@ -108,17 +108,31 @@ ensure_installation() {
     mkdir -p /data/db
   fi
 
-  if [ ! -d "${WGDASH}/src/db" ]; then
-    ln -s /data/db "${WGDASH}/src/db"
-  fi
-
   if [ ! -f "${config_file}" ]; then
     echo "Creating wg-dashboard.ini file"
     touch "${config_file}"
   fi
 
-  if [ ! -f "${WGDASH}/src/wg-dashboard.ini" ]; then
+  if [[ ! -L "${WGDASH}/src/db" ]] && [[ -d "${WGDASH}/src/db" ]]; then
-    ln -s "${config_file}" "${WGDASH}/src/wg-dashboard.ini"
+    echo "Removing ${WGDASH}/src/db since its not a symbolic link."
+    rm -rfv "${WGDASH}/src/db"
+  fi
+
+  if [[ -L "${WGDASH}/src/db" ]]; then
+    echo "${WGDASH}/src/db is a symbolic link."
+  else
+    ln -sv /data/db "${WGDASH}/src/db"
+  fi
+
+  if [[ ! -L "${WGDASH}/src/wg-dashboard.ini" ]] && [[ -f "${WGDASH}/src/wg-dashboard.ini" ]]; then
+    echo "Removing ${WGDASH}/src/wg-dashboard.ini since its not a symbolic link."
+    rm -fv "${WGDASH}/src/wg-dashboard.ini"
+  fi
+
+  if [[ -L "${WGDASH}/src/wg-dashboard.ini" ]]; then
+    echo "${WGDASH}/src/wg-dashboard.ini is a symbolic link."
+  else
+    ln -sv "${config_file}" "${WGDASH}/src/wg-dashboard.ini"
   fi
 
   # Setup WireGuard if needed
@@ -207,6 +221,9 @@ set_envvars() {
 start_and_monitor() {
   printf "\n---------------------- STARTING CORE -----------------------\n"
 
+  # Regenerate the resolvconf
+  /usr/sbin/resolvconf -u
+
   # Due to some instances complaining about this, making sure its there every time.
   mkdir -p /dev/net
   mknod /dev/net/tun c 10 200
@@ -220,8 +237,6 @@ start_and_monitor() {
 
   ${WGDASH}/src/venv/bin/gunicorn --config ${WGDASH}/src/gunicorn.conf.py
 
-  /usr/sbin/resolvconf -u
-
   if [ $? -ne 0 ]; then
     echo "Loading WGDashboard failed... Look above for details."
   fi