From 9a02e389a3a5d28e6162a726816f012480da6840 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Wed, 26 Nov 2025 12:50:30 +0000
Subject: [PATCH 1/6] Bumping version to 2.4.7

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 62e6420..48a6b50 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.6
\ No newline at end of file
+2.4.7
\ No newline at end of file

From 820ad101fc2d4f41c95f2a27a126093203338538 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Wed, 26 Nov 2025 12:50:49 +0000
Subject: [PATCH 2/6] Bumping version to 3.0.0

---
 VERSION       | 2 +-
 VERSION_MAJOR | 2 +-
 VERSION_MINOR | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 48a6b50..56fea8a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.7
\ No newline at end of file
+3.0.0
\ No newline at end of file
diff --git a/VERSION_MAJOR b/VERSION_MAJOR
index d8263ee..e440e5c 100644
--- a/VERSION_MAJOR
+++ b/VERSION_MAJOR
@@ -1 +1 @@
-2
\ No newline at end of file
+3
\ No newline at end of file
diff --git a/VERSION_MINOR b/VERSION_MINOR
index 7208c21..f398a20 100644
--- a/VERSION_MINOR
+++ b/VERSION_MINOR
@@ -1 +1 @@
-2.4
\ No newline at end of file
+3.0
\ No newline at end of file

From 4f95f2e9ef0cdc86baf4f800c2656aaaf375234e Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Wed, 26 Nov 2025 12:50:58 +0000
Subject: [PATCH 3/6] Updating workflow actions

---
 .github/workflows/auto-pr.yml       |  2 +-
 .github/workflows/dev.yml           | 12 ++++++------
 .github/workflows/publish.yml       | 26 +++++++++++++-------------
 .github/workflows/update-readme.yml |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml
index 54c3776..0d434ac 100644
--- a/.github/workflows/auto-pr.yml
+++ b/.github/workflows/auto-pr.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       -
         name: Checkout Branch ${{ github.ref_name }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       -
         name: Create Pull Request
         run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}."
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index d42c825..06788f4 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -39,12 +39,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Login to GitHub Container Registry
+        name: Login to Quay.io Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
+          registry: quay.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.QUAY_TOKEN }}
       -
         name: Build and export
         id: docker_export
@@ -73,8 +73,8 @@ jobs:
           tags: |
             bfren/wireguard:dev
             bfren/wireguard:${{ steps.version.outputs.contents }}-dev
-            ghcr.io/bfren/wireguard:dev
-            ghcr.io/bfren/wireguard:${{ steps.version.outputs.contents }}-dev
+            quay.io/bfren/wireguard:dev
+            quay.io/bfren/wireguard:${{ steps.version.outputs.contents }}-dev
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1b7857c..b4c5e88 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       -
         name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       -
         name: Get repository name
         run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
@@ -65,12 +65,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Login to GitHub Container Registry
+        name: Login to Quay.io Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
+          registry: quay.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.QUAY_TOKEN }}
       -
         name: Build and push
         id: docker_build
@@ -92,15 +92,15 @@ jobs:
             bfren/wireguard:wireguard${{ steps.wireguard_minor.outputs.contents }}
             bfren/wireguard:wireguard${{ steps.wireguard_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
             bfren/wireguard:wireguard${{ steps.wireguard_revision.outputs.contents }}
-            ghcr.io/bfren/wireguard:latest
-            ghcr.io/bfren/wireguard:${{ steps.version_major.outputs.contents }}
-            ghcr.io/bfren/wireguard:${{ steps.version_minor.outputs.contents }}
-            ghcr.io/bfren/wireguard:${{ steps.version.outputs.contents }}
-            ghcr.io/bfren/wireguard:wireguard${{ steps.wireguard_major.outputs.contents }}
-            ghcr.io/bfren/wireguard:wireguard${{ steps.wireguard_major.outputs.contents }}-${{ steps.version.outputs.contents }}
-            ghcr.io/bfren/wireguard:wireguard${{ steps.wireguard_minor.outputs.contents }}
-            ghcr.io/bfren/wireguard:wireguard${{ steps.wireguard_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
-            ghcr.io/bfren/wireguard:wireguard${{ steps.wireguard_revision.outputs.contents }}
+            quay.io/bfren/wireguard:latest
+            quay.io/bfren/wireguard:${{ steps.version_major.outputs.contents }}
+            quay.io/bfren/wireguard:${{ steps.version_minor.outputs.contents }}
+            quay.io/bfren/wireguard:${{ steps.version.outputs.contents }}
+            quay.io/bfren/wireguard:wireguard${{ steps.wireguard_major.outputs.contents }}
+            quay.io/bfren/wireguard:wireguard${{ steps.wireguard_major.outputs.contents }}-${{ steps.version.outputs.contents }}
+            quay.io/bfren/wireguard:wireguard${{ steps.wireguard_minor.outputs.contents }}
+            quay.io/bfren/wireguard:wireguard${{ steps.wireguard_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
+            quay.io/bfren/wireguard:wireguard${{ steps.wireguard_revision.outputs.contents }}
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 7fc7506..4e5b4a9 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -15,7 +15,7 @@ jobs:
         shell: bash
       -
         name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       -
         name: Login to DockerHub
         uses: docker/login-action@v3

From 4d9c8765026b49666112cd2a7293abc533a0db0d Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Wed, 26 Nov 2025 12:51:04 +0000
Subject: [PATCH 4/6] Switching to quay.io

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

diff --git a/Dockerfile b/Dockerfile
index b78afd3..60f07c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7
+FROM quay.io/bfren/alpine-s6:alpine3.22-5.6.7
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wireguard"
 

From 6a20efa15efcaa05dcd09c8d1259b4374584bc2e Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Wed, 26 Nov 2025 12:51:14 +0000
Subject: [PATCH 5/6] Using correct record formatting

---
 overlay/etc/bf/init.d/12-peers.nu | 2 +-
 overlay/etc/bf/init.d/13-conf.nu  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/overlay/etc/bf/init.d/12-peers.nu b/overlay/etc/bf/init.d/12-peers.nu
index a304b80..ddf3e52 100644
--- a/overlay/etc/bf/init.d/12-peers.nu
+++ b/overlay/etc/bf/init.d/12-peers.nu
@@ -46,7 +46,7 @@ def main [] {
         let public_key = bf fs read $public_key_file
         let preshared_key = bf fs read $preshared_key_file
         let private_key = bf fs read $private_key_file
-        with-env { NUM: $num, SERVER_PUBLIC_KEY: $server_public_key, PRESHARED_KEY: $preshared_key, PRIVATE_KEY: $private_key } {
+        with-env {NUM: $num, SERVER_PUBLIC_KEY: $server_public_key, PRESHARED_KEY: $preshared_key, PRIVATE_KEY: $private_key} {
             bf write debug "    configuration file"
             bf esh $"(bf env ETC_TEMPLATES)/peer-config.conf.esh" $"($peer_d)/config"
         }
diff --git a/overlay/etc/bf/init.d/13-conf.nu b/overlay/etc/bf/init.d/13-conf.nu
index cb10322..a336ed9 100644
--- a/overlay/etc/bf/init.d/13-conf.nu
+++ b/overlay/etc/bf/init.d/13-conf.nu
@@ -10,7 +10,7 @@ def main [] {
 
     # generate the interface configuration
     bf write "Generating WireGuard configuration file."
-    with-env { SERVER_PRIVATE_KEY: $server_private_key } {
+    with-env {SERVER_PRIVATE_KEY: $server_private_key} {
         bf esh $"(bf env ETC_TEMPLATES)/interface.conf.esh" $conf
     }
 
@@ -29,7 +29,7 @@ def main [] {
         # add this peer to the configuration file
         bf write $" .. ($name) [($num)]"
         bf write debug "    adding peer definition to configuration file"
-        with-env { NAME: $name, NUM: $num, PUBLIC_KEY: $public_key, PRESHARED_KEY: $preshared_key } {
+        with-env {NAME: $name, NUM: $num, PUBLIC_KEY: $public_key, PRESHARED_KEY: $preshared_key} {
             bf esh $"(bf env ETC_TEMPLATES)/peer-definition.conf.esh" | $"(char newline)($in)(char newline)" | save --append $conf
         }
     }

From e3233f84461b645e34a39c664cfccc4cb4ca6608 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Wed, 26 Nov 2025 12:51:31 +0000
Subject: [PATCH 6/6] Using latest base image

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

diff --git a/Dockerfile b/Dockerfile
index 60f07c0..2ddb6c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/bfren/alpine-s6:alpine3.22-5.6.7
+FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-wireguard"