From 7e86c1935b920180d8e0786dc54d729c74e79677 Mon Sep 17 00:00:00 2001
From: Begona Guereca <begonaguereca@github.com>
Date: Tue, 9 Aug 2022 21:29:55 +0000
Subject: [PATCH] t

---
 jenkins/bootstrap/Dockerfile      |  2 ++
 jenkins/bootstrap/setupjenkins.sh | 31 ++++++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/jenkins/bootstrap/Dockerfile b/jenkins/bootstrap/Dockerfile
index 66f13cd..c6b053d 100644
--- a/jenkins/bootstrap/Dockerfile
+++ b/jenkins/bootstrap/Dockerfile
@@ -12,3 +12,5 @@ COPY casc.yaml /var/jenkins_home/casc.yaml
 
 # seed with jobs
 COPY pipelines /usr/share/jenkins/ref/jobs
+
+
diff --git a/jenkins/bootstrap/setupjenkins.sh b/jenkins/bootstrap/setupjenkins.sh
index 577cbb6..e7fb5e0 100644
--- a/jenkins/bootstrap/setupjenkins.sh
+++ b/jenkins/bootstrap/setupjenkins.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 container_name="valet"
 username="admin"
@@ -6,11 +6,28 @@ password="password"
 
 echo "Building Jenkins instance!"
 
-# Build jenkins image from docker compose file 
-docker build -t jenkins:$container_name .
+if [ "$(docker ps -a | grep jenkins:$container_name)" ]; then
+  echo -e "Jenkins is running"
+  docker container start jenkins
+else
+  echo -e "\nStarting a new Jenkins container"
+  # Build jenkins image from docker compose file 
+  docker build -t jenkins:$container_name .
 
-# wait until docker image is ready
-sleep 2
+  # Build container
+  docker run -d --name jenkins -p 8080:8080 --env JENKINS_ADMIN_ID=$username --env JENKINS_ADMIN_PASSWORD=$password jenkins:$container_name
+fi
 
-# Build container
-docker run --name jenkins -p 8080:8080 --env JENKINS_ADMIN_ID=$username --env JENKINS_ADMIN_PASSWORD=$password jenkins:$container_name
+# allow valet to talk to Jenkins by removing network isolation between containers
+export DOCKER_ARGS="--network=host"
+grep -q "export DOCKER_ARGS=" ~/.bashrc || echo 'export DOCKER_ARGS="--network=host"' >> ~/.bashrc
+
+echo -e "\nWaiting for Jenkins to start..."
+while ! curl -s http://localhost:8080/ > /dev/null; do
+  echo -e "."
+  sleep 5
+done
+
+echo -e '\nJenkins is up and running!'
+echo -e "\nUsername: admin"
+echo -e "\bPassword: password"
\ No newline at end of file