From 1d485d10e4fe6b22709ab94bcdc6c0b620027582 Mon Sep 17 00:00:00 2001
From: TMKnight <548588+tmknight@users.noreply.github.com>
Date: Wed, 20 Nov 2024 08:12:35 -0500
Subject: [PATCH 1/2] Update NordVPN repo URL

---
 .github/workflows/docker-publish.yml | 1 +
 .github/workflows/get-version.yml    | 3 +--
 nordvpn.dockerfile                   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 1615c08..a4ea492 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,6 +23,7 @@ env:
   # Build args
   BUILD_ARGS: |
     "UBUNTU_VER=${{ vars.UBUNTU_VER }}"
+    "REPO_URL"=${{ vars.REPO_URL }}
 
 jobs:
   nordvpn-version:
diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml
index 5dd47f5..1c300ad 100644
--- a/.github/workflows/get-version.yml
+++ b/.github/workflows/get-version.yml
@@ -27,7 +27,6 @@ jobs:
         id: "pkg-version"
         shell: "bash"
         run: |
-            endpoint="https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/";
-            html=$(curl -s "${endpoint}");
+            html=$(curl -s "${{ vars.REPO_URL }}");
             most_recent_file=$(echo "${html}" | grep -o "<a href=\"[^\"]*_amd64.deb\"" | sed 's/<a href="//' | sed 's/">.*//' | sed 's/"$//' | sort | tail -n 1);
             echo NORDVPN_VERSION=$(echo $most_recent_file | sed 's/nordvpn_//' | sed  "s/_amd64.deb//") >> $GITHUB_OUTPUT
diff --git a/nordvpn.dockerfile b/nordvpn.dockerfile
index dfe1c84..427cbeb 100644
--- a/nordvpn.dockerfile
+++ b/nordvpn.dockerfile
@@ -1,6 +1,7 @@
 ARG UBUNTU_VER
 FROM ubuntu:${UBUNTU_VER}
 ARG UBUNTU_VER
+ARG REPO_URL
 ARG NORDVPN_VERSION
 ARG TARGETARCH
 LABEL org.opencontainers.image.base.name="ubuntu:${UBUNTU_VER}"
@@ -37,10 +38,9 @@ RUN apt-get update -qq \
   dnsutils \
   jq
 ## Get latest DEB from repo and install nordvpn
-RUN endpoint="https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/" \
-  && [ "${TARGETARCH}" != "amd64" ] && ARCH=arm64 || ARCH=amd64 \
+RUN [ "${TARGETARCH}" != "amd64" ] && ARCH=arm64 || ARCH=amd64 \
   && fileName="nordvpn_${NORDVPN_VERSION}_${ARCH}.deb" \
-  && curl -Lo /tmp/nordrepo.deb "${endpoint}${fileName}" \
+  && curl -Lo /tmp/nordrepo.deb "${REPO_URL}${fileName}" \
   ## Install latest DEB
   && apt-get install -y -qq \
   /tmp/nordrepo.deb

From b4d4e0d0b16c9b09d3b97fda10696b3f0006067b Mon Sep 17 00:00:00 2001
From: TMKnight <548588+tmknight@users.noreply.github.com>
Date: Wed, 20 Nov 2024 08:15:02 -0500
Subject: [PATCH 2/2] Correct punctuation

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a4ea492..d9aae00 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,7 +23,7 @@ env:
   # Build args
   BUILD_ARGS: |
     "UBUNTU_VER=${{ vars.UBUNTU_VER }}"
-    "REPO_URL"=${{ vars.REPO_URL }}
+    "REPO_URL=${{ vars.REPO_URL }}"
 
 jobs:
   nordvpn-version: