Skip to content

Commit 6b9dee7

Browse files
committed
Add Nickname, Change DEV actions
1 parent d3569c8 commit 6b9dee7

File tree

5 files changed

+63
-1
lines changed

5 files changed

+63
-1
lines changed
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Docker Image CI
2+
3+
on:
4+
push:
5+
paths:
6+
- 'fs/**'
7+
- 'Dockerfile'
8+
branches:
9+
- 'dev'
10+
11+
env:
12+
REGISTRY: ghcr.io
13+
IMAGE_NAME: ${{ github.repository }}
14+
15+
jobs:
16+
build-push:
17+
runs-on: ubuntu-latest
18+
19+
permissions:
20+
contents: read
21+
packages: write
22+
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@v4
26+
27+
- name: Set up QEMU
28+
uses: docker/setup-qemu-action@v3
29+
30+
- name: Set up Docker Buildx
31+
uses: docker/setup-buildx-action@v3
32+
33+
- name: Docker Meta
34+
id: meta
35+
uses: docker/metadata-action@v5
36+
with:
37+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
38+
39+
- name: Login to GHCR
40+
if: github.event_name != 'pull_request'
41+
uses: docker/login-action@v3
42+
with:
43+
registry: ghcr.io
44+
username: ${{ github.actor }}
45+
password: ${{ secrets.GITHUB_TOKEN }}
46+
47+
- name: Docker Build and Push
48+
uses: docker/build-push-action@v6
49+
with:
50+
context: .
51+
platforms: linux/amd64,linux/arm64
52+
push: ${{ github.event_name != 'pull_request' }}
53+
tags: ${{ steps.meta.outputs.tags }}
54+
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker-image.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
- 'Dockerfile'
88
branches:
99
- 'master'
10-
- 'dev'
1110
tags:
1211
- v*
1312

docker-compose/.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ NORDVPN_MESHNET_DEBUG=
1111
NORDVPN_HEALTHCHECK_INTERVAL=300
1212
# Healthcheck URL to verify if connectivity is up. Replace this with something on your Meshnet (if available), defaults to Google.
1313
NORDVPN_HEALTHCHECK_URL=www.google.com
14+
# Set a nickname for this device/instance on Meshnet, every peer will see and can use this nickname.
15+
NORDVPN_NICKNAME=
1416

1517
# Meshnet permissions
1618
# In this version of NordVPN, permissions must be configured directly on the client.

fs/usr/bin/meshnet_config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ IFS=','
66
# Enable Meshnet, this creates the interface and connects
77
nordvpn set meshnet on
88

9+
# Set nickname of this instance on the Meshnet network
10+
if [[ -n ${NORDVPN_NICKNAME} ]]; then
11+
nordvpn meshnet set nickname ${NORDVPN_NICKNAME}
12+
fi
13+
914
# Iterate through Meshnet peer permissions
1015
if [[ -n ${NORDVPN_DENY_PEER_ROUTING} ]]; then
1116
read -ra deny_routing <<< "${NORDVPN_DENY_PEER_ROUTING}"

kubernetes/meshnet-env.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ data:
1717
NORDVPN_HEALTHCHECK_INTERVAL: 300
1818
# Healthcheck URL to verify if connectivity is up. Replace this with something on your Meshnet (if available), defaults to Google.
1919
NORDVPN_HEALTHCHECK_URL: www.google.com
20+
# Set a nickname for this device/instance on Meshnet, every peer will see and can use this nickname.
21+
NORDVPN_NICKNAME: ""
2022

2123
# Meshnet permissions
2224
# In this version of NordVPN, permissions must be configured directly on the client.

0 commit comments

Comments
 (0)