From c800655e89dbcbce7c1daf748376b4e283cc4d65 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Fri, 6 Jul 2018 20:49:32 +0300
Subject: [PATCH] Added ECR credential helper and refactor

- Multi-stage build.
- Base on python:3.7-alpine, add CLI tools from other stages.
---
 Dockerfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ae8352d..698011c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,13 @@
+FROM golang:1.10-alpine as ecs
+RUN apk add --update --no-cache git build-base
+RUN go get github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login
+RUN wget https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest && \
+    install -m755 ecs-cli-linux-amd64-latest /usr/local/bin/ecs-cli
+
 FROM docker:latest
-RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/main > /etc/apk/repositories && \
-    apk add --update --no-cache python3 && \
-    pip3 install --no-cache-dir --upgrade awscli docker-compose pip | cat && \
-    wget https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest && \
-    install -m755 ecs-cli-linux-amd64-latest /usr/local/bin/ecs-cli && \
-    rm ecs-cli-linux-amd64-latest
+
+FROM python:3.7-alpine3.7
+COPY --from=docker /usr/local/bin/docker /usr/local/bin/
+COPY --from=ecs /go/bin/docker-credential-ecr-login /usr/local/bin/ecr-login
+COPY --from=ecs /usr/local/bin/ecs-cli /usr/local/bin/
+RUN pip install --no-cache-dir --progress-bar=off awscli docker-compose
-- 
GitLab