Merge pull request #106 from tmknight/develop

v3.0.5
tmknight · Nov 20, 2024 · 6861dd2 · 6861dd2
2 parents e49c10a + b4d4e0d
commit 6861dd2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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