Skip to content

Commit d017a06

Browse files
sevenEngToshbrown
authored andcommitted
enable broadcast traffic relay (#243)
* enable broadcast traffic relay
1 parent ab44d42 commit d017a06

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

databox-build-core

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,16 @@ build()
2525
{
2626
echo "[$(datef) $ME]: Starting build ${1} ..."
2727
cd $1
28-
OUTPUT=$(docker build -t $2 -f Dockerfile${DATABOX_ARCH} .)
28+
29+
DOCKERFILE=""
30+
if [ -z "$3" ]
31+
then
32+
DOCKERFILE="Dockerfile${DATABOX_ARCH}"
33+
else
34+
DOCKERFILE="${3}${DATABOX_ARCH}"
35+
fi
36+
37+
OUTPUT=$(docker build -t $2 -f ${DOCKERFILE} .)
2938
test_assert $? 0 "Build ${1}" "$OUTPUT"
3039
cd ..
3140
}
@@ -36,3 +45,4 @@ build "core-arbiter" "arbiter"
3645
build "core-export-service" "export-service"
3746
build "core-store" "core-store"
3847
build "core-network" "core-network"
48+
build "core-network" "core-network-relay" "Dockerfile-relay"

databox-start

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,14 @@ err "Starting Databox"
191191

192192
docker network create -d overlay --attachable databox-system-net
193193

194+
BCAST_FIFO="/tmp/databox_relay"
195+
export BCAST_FIFO=${BCAST_FIFO}
196+
export BCAST_IP=${EXT_IP}
197+
198+
if [ ! -p "${BCAST_FIFO}" ]; then
199+
mkfifo ${BCAST_FIFO}
200+
fi
201+
194202
docker-compose -f ./docker-core-network.yaml up -d
195203
_exec node ./src/createResolvConf.js "$(docker inspect $(docker ps -q --filter="name=databox-network"))"
196204

databox-stop

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ err "Stopping and Removing databox-bridge ..."
6060
docker-compose -f ./docker-core-network.yaml down
6161
err "Removing network databox-system-net ..."
6262
docker network rm databox-system-net >/dev/null 2>&1
63+
err "Deleting broadcast relay fifo ..."
64+
rm /tmp/databox_relay
6365

6466
err "Waiting ..."
6567
sleep 10 # give docker some time to remove the networks etc

docker-core-network.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,18 @@ services:
1010
volumes:
1111
- './certs/arbiterToken-databox-network:/run/secrets/DATABOX_NETWORK_KEY'
1212
- './certs/databox-network.pem:/run/secrets/DATABOX_NETWORK.pem'
13+
- '${BCAST_FIFO}:/tmp/relay'
14+
command: ["-f", "/tmp/relay"]
1315
cap_add:
1416
- NET_ADMIN
1517

18+
databox-broadcast-relay:
19+
image: ${DOCKER_REPO}core-network-relay:${DATABOX_CORE_IMAGE_VERSION}
20+
network_mode: "host"
21+
volumes:
22+
- '${BCAST_FIFO}:/tmp/relay'
23+
command: ["-f", "/tmp/relay", "-h", "${BCAST_IP}"]
24+
1625
networks:
1726
databox-system-net:
1827
external: true

0 commit comments

Comments
 (0)