From cc3f6da0e279c50e30b8fa04b0a644330a74ec2c Mon Sep 17 00:00:00 2001
From: catalinpan <catalin.gf@gmail.com>
Date: Wed, 24 May 2017 22:51:37 +0100
Subject: [PATCH] upgraded to the latest stable versions of awscli and nginx

---
 Dockerfile             | 7 ++-----
 configs/auth_update.sh | 2 +-
 configs/entrypoint.sh  | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2e7872e..74fec3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,10 @@
-FROM nginx:1.11.10-alpine
+FROM nginx:1.12.0-alpine
 
 RUN apk -v --update add \
         python \
         py-pip \
-        groff \
-        less \
-        mailcap \
         && \
-    pip install --upgrade awscli s3cmd python-magic && \
+    pip install --upgrade pip awscli==1.11.92 && \
     apk -v --purge del py-pip && \
     rm /var/cache/apk/*
 
diff --git a/configs/auth_update.sh b/configs/auth_update.sh
index 026e456..63e6443 100755
--- a/configs/auth_update.sh
+++ b/configs/auth_update.sh
@@ -4,7 +4,7 @@ nx_conf=/etc/nginx/nginx.conf
 
 # update the auth token
 auth=$(grep  X-Forwarded-User ${nx_conf} | awk '{print $4}'| uniq|tr -d "\n\r")
-token=$(aws ecr get-login | awk '{print $6}')
+token=$(aws ecr get-login --no-include-email | awk '{print $6}')
 auth_n=$(echo AWS:${token}  | base64 |tr -d "[:space:]")
 
 sed -i "s|${auth%??}|${auth_n}|g" ${nx_conf}
diff --git a/configs/entrypoint.sh b/configs/entrypoint.sh
index 44fc258..1718432 100755
--- a/configs/entrypoint.sh
+++ b/configs/entrypoint.sh
@@ -35,11 +35,11 @@ fi
 
 
 # update the auth token
-aws_cli_exec=$(aws ecr get-login)
+aws_cli_exec=$(aws ecr get-login --no-include-email)
 auth=$(grep  X-Forwarded-User ${nx_conf} | awk '{print $4}'| uniq|tr -d "\n\r")
 token=$(echo "${aws_cli_exec}" | awk '{print $6}')
 auth_n=$(echo AWS:${token}  | base64 |tr -d "[:space:]")
-reg_url=$(echo "${aws_cli_exec}" | awk '{print $9}')
+reg_url=$(echo "${aws_cli_exec}" | awk '{print $7}')
 
 sed -i "s|${auth%??}|${auth_n}|g" ${nx_conf}
 sed -i "s|REGISTRY_URL|$reg_url|g" ${nx_conf}