From 0574aefd3b5e7acfefa8ce2f71b07af0c5a0e303 Mon Sep 17 00:00:00 2001
From: Begona Guereca <begonaguereca@github.com>
Date: Wed, 17 Aug 2022 15:54:08 -0700
Subject: [PATCH] Update setup script

---
 jenkins/bootstrap/Dockerfile | 8 +++-----
 jenkins/bootstrap/setup.sh   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/jenkins/bootstrap/Dockerfile b/jenkins/bootstrap/Dockerfile
index c6b053d..23db62b 100644
--- a/jenkins/bootstrap/Dockerfile
+++ b/jenkins/bootstrap/Dockerfile
@@ -4,13 +4,11 @@ ENV JAVA_OPTS -Djenkins.install.runSetupWizard=false
 ENV CASC_JENKINS_CONFIG /var/jenkins_home/casc.yaml
 
 # add plugins
-COPY /plugins.txt /usr/share/jenkins/ref/plugins.txt
+COPY $CODESPACE_VSCODE_FOLDER/jenkins/bootstrap/plugins.txt /usr/share/jenkins/ref/plugins.txt
 RUN /usr/local/bin/install-plugins.sh < /usr/share/jenkins/ref/plugins.txt
 
 # add security perms
-COPY casc.yaml /var/jenkins_home/casc.yaml
+COPY $CODESPACE_VSCODE_FOLDER/jenkins/bootstrap/casc.yaml /var/jenkins_home/casc.yaml
 
 # seed with jobs
-COPY pipelines /usr/share/jenkins/ref/jobs
-
-
+COPY $CODESPACE_VSCODE_FOLDER/jenkins/bootstrap/pipelines /usr/share/jenkins/ref/jobs
diff --git a/jenkins/bootstrap/setup.sh b/jenkins/bootstrap/setup.sh
index e7fb5e0..b1e4b7b 100755
--- a/jenkins/bootstrap/setup.sh
+++ b/jenkins/bootstrap/setup.sh
@@ -12,7 +12,7 @@ if [ "$(docker ps -a | grep jenkins:$container_name)" ]; then
 else
   echo -e "\nStarting a new Jenkins container"
   # Build jenkins image from docker compose file 
-  docker build -t jenkins:$container_name .
+  docker build -t jenkins:$container_name -f $CODESPACE_VSCODE_FOLDER/jenkins/bootstrap/Dockerfile .
 
   # Build container
   docker run -d --name jenkins -p 8080:8080 --env JENKINS_ADMIN_ID=$username --env JENKINS_ADMIN_PASSWORD=$password jenkins:$container_name