use tag to build

docker · May 29, 2020 · 90ba315 · 90ba315
1 parent 6a2e1b0
commit 90ba315
Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/internal/createNew.txt b/internal/createNew.txt
@@ -7,7 +7,7 @@ storage 30gig
 security group: gte-training
 tag env training
 
-user data script from https://github.internet2.edu/docker/grouper_training/raw/$GROUPER_GTE_BRANCH/internal/userdata.sh
+user data script from https://github.internet2.edu/docker/grouper_training/raw/202006-post/internal/userdata.sh
 
 ssh -i gte-training-master.pem ec2-user@3.136.154.33
 

diff --git a/internal/mkstudent.sh b/internal/mkstudent.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+export GROUPER_GTE_BRANCH=GROUPER_BUILD_CLOUD_FORMATION
+#export GROUPER_GTE_DOCKER_BRANCH=GROUPER_BUILD_CLOUD_FORMATION
+export GROUPER_GTE_DOCKER_BRANCH=202006
+
 echo "$GROUPER_GTE_BRANCH" > grouperGteBranch.txt
 chmod a+r grouperGteBranch.txt
 echo "$GROUPER_GTE_DOCKER_BRANCH" > grouperGteDockerBranch.txt

diff --git a/internal/userdata.sh b/internal/userdata.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-export GROUPER_GTE_BRANCH=202006-post
-#export GROUPER_GTE_DOCKER_BRANCH=$GROUPER_GTE_BRANCH
-export GROUPER_GTE_DOCKER_BRANCH=202006
 
 yum -y install wget
 cd /root
-wget "https://github.internet2.edu/docker/grouper_training/raw/$GROUPER_GTE_BRANCH/internal/mkstudent.sh"
+wget "https://github.internet2.edu/docker/grouper_training/raw/GROUPER_BUILD_CLOUD_FORMATION/internal/mkstudent.sh"
 chmod +x mkstudent.sh
 /root/mkstudent.sh