Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.0.5 #106

Merged
merged 2 commits into from
Nov 20, 2024
Merged

v3.0.5 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d485d1
Update NordVPN repo URL
tmknight Nov 20, 2024
b4d4e0d
Correct punctuation
tmknight Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ env:
# Build args
BUILD_ARGS: |
"UBUNTU_VER=${{ vars.UBUNTU_VER }}"
"REPO_URL=${{ vars.REPO_URL }}"

jobs:
nordvpn-version:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/get-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions nordvpn.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down Expand Up @@ -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
Expand Down