From f436703ce802d505486a9c2550c00ab06be200bd Mon Sep 17 00:00:00 2001
From: Emile <hanemile@protonmail.com>
Date: Mon, 21 Oct 2019 11:33:47 +0200
Subject: pulling docker images

---
 setup.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 1f604e5..a88be68 100755
--- a/setup.sh
+++ b/setup.sh
@@ -40,6 +40,12 @@ read -e -p "Grafana admin pwd: " -i "secret" GF_SECURITY_ADMIN_PASSWORD
 echo "GF_SERVER_ROOT_URL=$GF_SERVER_ROOT_URL" > grafana.env
 echo "GF_SECURITY_ADMIN_PASSWORD=$GF_SECURITY_ADMIN_PASSWORD" >> grafana.env
 
+# pull some docker images needed from the darknebu.la registry such as the
+# companion container and the vpn container
+echo "Pulling docker images needed..."
+docker pull registry.darknebu.la/circus/companion:latest
+docker pull registry.darknebu.la/circus/vpn:latest
+
 # Ask if the circus should be started
 read -p "Do you want to start the circus now? (y/n) " -n 1 -r
 echo # (optional) move to a new line
@@ -47,5 +53,6 @@ if [[ ! $REPLY =~ ^[Yy]$  ]]
 then
         exit 1
 fi
+
 # start the docker-compose
-docker-compose up -d
+docker-compose -f $(pwd)/docker-compose.yml up -d
-- 
cgit 1.4.1