From 6cf96de0b4373dc94911e3071c1b1739ea4625cd Mon Sep 17 00:00:00 2001
From: Daan <dselen@nerthus.nl>
Date: Tue, 22 Apr 2025 21:20:41 +0200
Subject: [PATCH 1/2] Moved Docker file around, cleaning.

---
 .github/workflows/{docker-related.yaml => docker.yaml} | 1 +
 Dockerfile => docker/Dockerfile                        | 4 ++--
 entrypoint.sh => docker/entrypoint.sh                  | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename .github/workflows/{docker-related.yaml => docker.yaml} (97%)
 rename Dockerfile => docker/Dockerfile (97%)
 rename entrypoint.sh => docker/entrypoint.sh (100%)

diff --git a/.github/workflows/docker-related.yaml b/.github/workflows/docker.yaml
similarity index 97%
rename from .github/workflows/docker-related.yaml
rename to .github/workflows/docker.yaml
index a2ae195..ef9682f 100644
--- a/.github/workflows/docker-related.yaml
+++ b/.github/workflows/docker.yaml
@@ -41,6 +41,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: ./docker/Dockerfile
           push: true
           tags: ${{ env.DOCKER_IMAGE }}:latest
           platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 97%
rename from Dockerfile
rename to docker/Dockerfile
index 9d45e70..c9e168e 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -81,10 +81,10 @@ 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 entrypoint.sh /entrypoint.sh
+COPY ./docker/entrypoint.sh /entrypoint.sh
 
 # Exposing the default WireGuard Dashboard port for web access.
 EXPOSE 10086
 WORKDIR $WGDASH
 
-ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
diff --git a/entrypoint.sh b/docker/entrypoint.sh
similarity index 100%
rename from entrypoint.sh
rename to docker/entrypoint.sh

From 83b4d96f42ff09df8f5b1fc15666879caf6520de Mon Sep 17 00:00:00 2001
From: Daan <dselen@nerthus.nl>
Date: Tue, 22 Apr 2025 21:36:28 +0200
Subject: [PATCH 2/2] go image bump

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c9e168e..c07d7b5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23 AS compiler
+FROM golang:1.24 AS compiler
 WORKDIR /go
 
 RUN apt-get update && apt-get install -y --no-install-recommends \