From a07e33dd2bee79a33f7beca261a39a2c4650da19 Mon Sep 17 00:00:00 2001
From: zeus <rootapostolos@swarmlab.io>
Date: Wed, 12 May 2021 03:19:43 +0300
Subject: [PATCH] alpine admin

---
 files/mongo/docker-compose.yml        | 13 +++++++++++++
 hybrid/scripts/check-wg-connection.sh |  2 +-
 start                                 |  1 +
 start-venus-stats                     |  3 +++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/files/mongo/docker-compose.yml b/files/mongo/docker-compose.yml
index 20883df..f3b410e 100644
--- a/files/mongo/docker-compose.yml
+++ b/files/mongo/docker-compose.yml
@@ -24,6 +24,19 @@ services:
             MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD}
             MONGO_INITDB_DATABASE: ${MONGO_INITDB_DATABASE}
 
+    swlabadminvenus:
+        hostname: 'swlabadminvenus'
+        image: 'hub.swarmlab.io:5480/venus-admin:latest'
+        entrypoint: /bin/bash -c "tail -f /dev/null"
+        user: root
+        network_mode: host
+        cap_add:
+            - NET_ADMIN
+            - SYS_MODULE
+        volumes:
+            - ${VENUSADMIN}:/config
+            - /lib/modules:/lib/modules
+
 volumes: 
     swlabmongovenusData:
     swlabmongovenusLog:
diff --git a/hybrid/scripts/check-wg-connection.sh b/hybrid/scripts/check-wg-connection.sh
index eb8dc1b..32e7495 100755
--- a/hybrid/scripts/check-wg-connection.sh
+++ b/hybrid/scripts/check-wg-connection.sh
@@ -8,7 +8,7 @@ for f in /sys/class/net/swlab*; do
 	f="${f#"${f%%[![:space:]]*}"}"
 	f="${f%"${f##*[![:space:]]}"}"
 	f=${f:5}
-	for fdir in ./hybrid/connect/$f*; do
+	for fdir in /config/$f*; do
 	    if [[ -d "$fdir" && ! -L "$fdir" ]]; then
 		fdirfull=$fdir
 		fdirdir=$(basename $fdir)
diff --git a/start b/start
index 800b595..a44f71f 100755
--- a/start
+++ b/start
@@ -32,6 +32,7 @@ sudo /bin/bash $wdir/hybrid/connect/get-base-ca > /dev/null 2>&1
 
 ./update-agent.sh
 docker pull hub.swarmlab.io:5480/venusclient:latest
+docker pull hub.swarmlab.io:5480/venus-admin:latest
 
 bash ./start-venus-stats
 
diff --git a/start-venus-stats b/start-venus-stats
index 429fe74..f58e45b 100755
--- a/start-venus-stats
+++ b/start-venus-stats
@@ -70,6 +70,7 @@ conf=$wdir/hybrid/venus-stats/mongod.conf
 port=$(EPHEMERAL_PORT)
 coll=logs
 ip='127.0.0.1'
+venusadmin=$wdir/hybrid/connect
 
 
 cat << FOE > $wdir/hybrid/venus-stats/.env
@@ -83,6 +84,7 @@ MONGO_VENUS_CONF=$conf
 MONGO_VENUS_IP=$ip
 MONGO_VENUS_PORT=$port
 MONGO_VENUS_COLLECTION=$coll
+VENUSADMIN=$venusadmin
 FOE
 
 
@@ -93,6 +95,7 @@ cd $wdir/hybrid/venus-stats;
 
 docker-compose down &&
  docker-compose rm &&
+ docker volume rm venus-stats_swlabmongovenusData &&
  docker-compose pull &&
  docker-compose build --no-cache &&
  docker-compose up -d --force-recreate