Rename wiretrustee-signal to netbird-signal (#313)

* rename wiretrustee-signal to netbird-signal

* Rename Signal repositories and source bin

* Adjust docker-compose with signal volume [skip ci]

Co-authored-by: mlsmaycon <mlsmaycon@gmail.com>
This commit is contained in:
shatoboar
2022-05-13 21:51:41 +02:00
committed by GitHub
parent 7d893c0238
commit 77e58295e7
8 changed files with 165 additions and 49 deletions

View File

@@ -22,14 +22,24 @@ then
export TURN_PASSWORD=$(openssl rand -base64 32|sed 's/=//g')
fi
# if wiretrustee-mgmt already exists, leave it, else create new mgmt with netbird
MGMT_VOLUMENAME="${$VOLUME_PREFIX}${MGMT_VOLUMESUFFIX}"
SIGNAL_VOLUMENAME="${$VOLUME_PREFIX}${SIGNAL_VOLUMESUFFIX}"
LETSENCRYPT_VOLUMENAME="${$VOLUME_PREFIX}${LETSENCRYPT_VOLUMESUFFIX}"
# if volume with wiretrustee- prefix already exists, use it, else create new with netbird-
OLD_PREFIX='wiretrustee-'
if docker volume ls | grep -q "${OLD_PREFIX}mgmt"; then
VOLUME_PREFIX=$OLD_PREFIX
if docker volume ls | grep -q "${OLD_PREFIX}${MGMT_VOLUMESUFFIX}"; then
MGMT_VOLUMENAME="${$OLD_PREFIX}${MGMT_VOLUMESUFFIX}"
fi
if docker volume ls | grep -q "${OLD_PREFIX}${SIGNAL_VOLUMESUFFIX}"; then
SIGNAL_VOLUMENAME="${$OLD_PREFIX}${SIGNAL_VOLUMESUFFIX}"
fi
if docker volume ls | grep -q "${OLD_PREFIX}${LETSENCRYPT_VOLUMESUFFIX}"; then
LETSENCRYPT_VOLUMENAME="${$OLD_PREFIX}${LETSENCRYPT_VOLUMESUFFIX}"
fi
export MGMT_VOLUMENAME="${$VOLUME_PREFIX}mgmt"
export LETSENCRYPT_VOLUMENAME="${$VOLUME_PREFIX}letsencrypt"
export MGMT_VOLUMENAME
export SIGNAL_VOLUMENAME
export LETSENCRYPT_VOLUMENAME
envsubst < docker-compose.yml.tmpl > docker-compose.yml
envsubst < management.json.tmpl > management.json

View File

@@ -19,10 +19,10 @@ services:
- $LETSENCRYPT_VOLUMENAME:/etc/letsencrypt/
# Signal
signal:
image: wiretrustee/signal:latest
image: netbird/signal:latest
restart: unless-stopped
volumes:
- wiretrustee-signal:/var/lib/wiretrustee
- $SIGNAL_VOLUMENAME:/var/lib/netbird
ports:
- 10000:10000
# # port and command for Let's Encrypt validation
@@ -56,5 +56,5 @@ services:
network_mode: host
volumes:
$MGMT_VOLUMENAME:
wiretrustee-signal:
$LETSENCRYPT_VOLUMENAME:
$SIGNAL_VOLUMENAME:
$LETSENCRYPT_VOLUMENAME:

View File

@@ -38,11 +38,11 @@ TURN_MIN_PORT=49152
TURN_MAX_PORT=65535
VOLUME_PREFIX="netbird-"
MGMT_VOLUMENAME=""
LETSENCRYPT_VOLUMENAME=""
MGMT_VOLUMESUFFIX="mgmt"
SIGNAL_VOLUMESUFFIX="signal"
LETSENCRYPT_VOLUMESUFFIX="letsencrypt"
# exports
export VOLUME_PREFIX
export WIRETRUSTEE_DOMAIN
export WIRETRUSTEE_AUTH0_DOMAIN
export WIRETRUSTEE_AUTH0_CLIENT_ID
@@ -56,4 +56,7 @@ export TURN_USER
export TURN_PASSWORD
export TURN_MIN_PORT
export TURN_MAX_PORT
export VOLUME_PREFIX
export MGMT_VOLUMESUFFIX
export SIGNAL_VOLUMESUFFIX
export LETSENCRYPT_VOLUMESUFFIX