v3.0.0

.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 }}."

.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 }}

.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 }}

.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

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.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"
 

VERSION

@@ -1 +1 @@
-2.4.6
+3.0.0

VERSION_MAJOR

@@ -1 +1 @@
-2
+3

VERSION_MINOR

@@ -1 +1 @@
-2.4
+3.0

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"
         }

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
         }
     }