From 4211d269de2a67ca01734f59628d4e4f21d5df16 Mon Sep 17 00:00:00 2001
From: patrikalonso <20287463+patrikalonso@users.noreply.github.com>
Date: Thu, 15 Apr 2021 17:09:57 +0200
Subject: [PATCH 1/2] feat: query cloudmap for stitcher ips

---
 Dockerfile    | 1 +
 render_cfg.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e29a09c..7593873 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ RUN apk add --no-cache \
        sed \
        socat \
        bind-tools \
+       aws-cli \
     ;
 
 ENV RSYSLOG=y
diff --git a/render_cfg.sh b/render_cfg.sh
index 25378da..6f1612f 100755
--- a/render_cfg.sh
+++ b/render_cfg.sh
@@ -27,7 +27,7 @@ else
 
   # Resolve DNS
   for _service in ${service//,/ }; do
-    dig $_service 2>/dev/null | grep  ^$_service | awk '{print $5}'
+    aws servicediscovery list-instances --service-id $_service --query 'Instances[].Attributes.AWS_INSTANCE_IPV4' --output text --region eu-west-1
   done | sort | paste -sd ',' > $tmpfile
   if [ $(wc -c $tmpfile | gawk '{print $1}') -eq 0 ]; then
     rm $tmpfile

From d9fd0dd055d59fdd99b1f5d54562f859794ed60b Mon Sep 17 00:00:00 2001
From: "mark.fuller" <pmfuller@yahoo.com>
Date: Sat, 17 Apr 2021 10:03:34 +0100
Subject: [PATCH 2/2] fix: capture deployed version

---
 Dockerfile    | 6 +++++-
 render_cfg.sh | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7593873..ed9a9b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,9 +8,13 @@ RUN apk add --no-cache \
        sed \
        socat \
        bind-tools \
-       aws-cli \
     ;
 
+RUN apk add python curl 
+RUN curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
+RUN unzip awscli-bundle.zip
+RUN ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
+
 ENV RSYSLOG=y
 
 COPY render_cfg.sh         /
diff --git a/render_cfg.sh b/render_cfg.sh
index 6f1612f..a8ed4d1 100755
--- a/render_cfg.sh
+++ b/render_cfg.sh
@@ -28,7 +28,7 @@ else
   # Resolve DNS
   for _service in ${service//,/ }; do
     aws servicediscovery list-instances --service-id $_service --query 'Instances[].Attributes.AWS_INSTANCE_IPV4' --output text --region eu-west-1
-  done | sort | paste -sd ',' > $tmpfile
+  done | tr '\t' '\n' | sort | paste -sd ',' > $tmpfile
   if [ $(wc -c $tmpfile | gawk '{print $1}') -eq 0 ]; then
     rm $tmpfile
     echo "Unable to resolve addresses for $service "