From c1148a761e6ecc29d09f4cd97fb74a782d84dfc2 Mon Sep 17 00:00:00 2001
From: Chris Hyzer <mchyzer@isc.upenn.edu>
Date: Fri, 12 Feb 2021 10:42:12 -0500
Subject: [PATCH] upgrade to 2.5.42

---
 .gitignore                         | 1 +
 base/Dockerfile                    | 2 +-
 gte                                | 1 +
 internal/passwordsToSpreadsheet.sh | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 263d349..073acf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ tmp
 .DS_Store
 _build
 /.project
+temp
\ No newline at end of file
diff --git a/base/Dockerfile b/base/Dockerfile
index ec420dd..6469854 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,7 +1,7 @@
 FROM tier/shib-idp:3.4.3_20190201 as idp
 
 # Grouper version for the entire GTE
-FROM i2incommon/grouper:2.5.41
+FROM i2incommon/grouper:2.5.42
 
 # Disable docker HEALTHCHECK inherited from tier/shib-sp
 HEALTHCHECK NONE
diff --git a/gte b/gte
index 132c7d9..35967e0 100755
--- a/gte
+++ b/gte
@@ -17,6 +17,7 @@ show_help() {
 
 for arg in $*; do
   case $arg in
+        --sql) EXTRA_ARGS="$EXTRA_ARGS -p 3306:3306"; shift;;
         --ldap) EXTRA_ARGS="$EXTRA_ARGS -p 389:389"; shift;;
         --rabbitmq) EXTRA_ARGS="$EXTRA_ARGS --link rabbitmq:rabbitmq"; RABBITMQ_FL=1; shift;;
         --fg) is_foreground=1; shift;;
diff --git a/internal/passwordsToSpreadsheet.sh b/internal/passwordsToSpreadsheet.sh
index 0c54674..64a865d 100644
--- a/internal/passwordsToSpreadsheet.sh
+++ b/internal/passwordsToSpreadsheet.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-aws ec2 describe-instances | jq '[.Reservations | .[] | .Instances | .[] | select(.State.Name!="terminated") | select((.Tags[]|select(.Key=="env")|.Value) =="grouperTraining")] | .[] | .InstanceId' | xargs -n 1 -I{}  aws  ec2 get-console-output  --instance-id {} | gawk 'match($0, /abcdefg12345678,([0-9.]+),([0-9a-zA-Z]+),/, m) { print m[1], ",student,", m[2], ",ssh -L 8443:localhost:8443 -l student ", m[1]; }'
+ aws ec2 describe-instances --filters "Name=tag-key,Values=env" --filters "Name=tag-value,Values=grouperTraining" |jq '[.Reservations | .[] | .Instances | .[] | select(.State.Name!="terminated") ] | .[] | .InstanceId' | xargs -n 1 -I{}  aws  ec2 get-console-output  --instance-id {} | gawk 'match($0, /abcdefg12345678,([0-9.]+),([0-9a-zA-Z]+),/, m) { print m[1], ",student,", m[2], ",ssh -L 8443:localhost:8443 -l student ", m[1]; }'
+ 
\ No newline at end of file