Skip to content

Commit

Permalink
enable broadcast traffic relay (#243)
Browse files Browse the repository at this point in the history
* enable broadcast traffic relay
  • Loading branch information
sevenEng authored and Toshbrown committed Apr 26, 2018
1 parent ab44d42 commit d017a06
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 1 deletion.
12 changes: 11 additions & 1 deletion databox-build-core
Expand Up @@ -25,7 +25,16 @@ build()
{
echo "[$(datef) $ME]: Starting build ${1} ..."
cd $1
OUTPUT=$(docker build -t $2 -f Dockerfile${DATABOX_ARCH} .)

DOCKERFILE=""
if [ -z "$3" ]
then
DOCKERFILE="Dockerfile${DATABOX_ARCH}"
else
DOCKERFILE="${3}${DATABOX_ARCH}"
fi

OUTPUT=$(docker build -t $2 -f ${DOCKERFILE} .)
test_assert $? 0 "Build ${1}" "$OUTPUT"
cd ..
}
Expand All @@ -36,3 +45,4 @@ build "core-arbiter" "arbiter"
build "core-export-service" "export-service"
build "core-store" "core-store"
build "core-network" "core-network"
build "core-network" "core-network-relay" "Dockerfile-relay"
8 changes: 8 additions & 0 deletions databox-start
Expand Up @@ -191,6 +191,14 @@ err "Starting Databox"

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

BCAST_FIFO="/tmp/databox_relay"
export BCAST_FIFO=${BCAST_FIFO}
export BCAST_IP=${EXT_IP}

if [ ! -p "${BCAST_FIFO}" ]; then
mkfifo ${BCAST_FIFO}
fi

docker-compose -f ./docker-core-network.yaml up -d
_exec node ./src/createResolvConf.js "$(docker inspect $(docker ps -q --filter="name=databox-network"))"

Expand Down
2 changes: 2 additions & 0 deletions databox-stop
Expand Up @@ -60,6 +60,8 @@ err "Stopping and Removing databox-bridge ..."
docker-compose -f ./docker-core-network.yaml down
err "Removing network databox-system-net ..."
docker network rm databox-system-net >/dev/null 2>&1
err "Deleting broadcast relay fifo ..."
rm /tmp/databox_relay

err "Waiting ..."
sleep 10 # give docker some time to remove the networks etc
Expand Down
9 changes: 9 additions & 0 deletions docker-core-network.yaml
Expand Up @@ -10,9 +10,18 @@ services:
volumes:
- './certs/arbiterToken-databox-network:/run/secrets/DATABOX_NETWORK_KEY'
- './certs/databox-network.pem:/run/secrets/DATABOX_NETWORK.pem'
- '${BCAST_FIFO}:/tmp/relay'
command: ["-f", "/tmp/relay"]
cap_add:
- NET_ADMIN

databox-broadcast-relay:
image: ${DOCKER_REPO}core-network-relay:${DATABOX_CORE_IMAGE_VERSION}
network_mode: "host"
volumes:
- '${BCAST_FIFO}:/tmp/relay'
command: ["-f", "/tmp/relay", "-h", "${BCAST_IP}"]

networks:
databox-system-net:
external: true

0 comments on commit d017a06

Please sign in to comment.