From 6647ff210792d881b6d209e4784f4225f47d413d Mon Sep 17 00:00:00 2001 From: Shubham Agrawal Date: Wed, 10 Feb 2021 16:06:42 +0530 Subject: [PATCH 1/3] Use pip to install aws cl1 v1.19.5 --- docker/Dockerfile.linux.amd64 | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index d90fa68..06c2c7f 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -1,31 +1,10 @@ FROM alpine:3.12 RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl - -ENV GLIBC_VER=2.31-r0 -RUN apk --no-cache add \ - binutils \ - curl \ - && curl -sL https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \ - && curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-${GLIBC_VER}.apk \ - && curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk \ - && apk add --no-cache \ - glibc-${GLIBC_VER}.apk \ - glibc-bin-${GLIBC_VER}.apk \ - && curl -sL https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.1.24.zip -o awscliv2.zip \ - && unzip awscliv2.zip \ - && aws/install \ - && rm -rf \ - awscliv2.zip \ - aws \ - /usr/local/aws-cli/v2/*/dist/aws_completer \ - /usr/local/aws-cli/v2/*/dist/awscli/data/ac.index \ - /usr/local/aws-cli/v2/*/dist/awscli/examples \ - && apk --no-cache del \ - binutils \ - curl \ - && rm glibc-${GLIBC_VER}.apk \ - && rm glibc-bin-${GLIBC_VER}.apk \ - && rm -rf /var/cache/apk/* +RUN apk update && apk add git groff python3 python3-dev py3-pip py3-six py3-urllib3 py3-colorama build-base libffi-dev openssl-dev && \ + pip install 'awscli==1.19.5' && \ + apk del python3-dev py3-pip build-base libffi-dev openssl-dev && \ + rm -rf /var/cache/apk/* +RUN aws --version ADD posix/* /usr/local/bin/ ENTRYPOINT ["/usr/local/bin/clone"] From 937b910001f118a643e0043532fe34c50c3b3c95 Mon Sep 17 00:00:00 2001 From: Shubham Agrawal Date: Wed, 10 Feb 2021 17:11:16 +0530 Subject: [PATCH 2/3] Using alpine package for aws cli --- docker/Dockerfile.linux.amd64 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index 06c2c7f..8614ea7 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -1,9 +1,5 @@ FROM alpine:3.12 -RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl -RUN apk update && apk add git groff python3 python3-dev py3-pip py3-six py3-urllib3 py3-colorama build-base libffi-dev openssl-dev && \ - pip install 'awscli==1.19.5' && \ - apk del python3-dev py3-pip build-base libffi-dev openssl-dev && \ - rm -rf /var/cache/apk/* +RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl aws-cli RUN aws --version ADD posix/* /usr/local/bin/ From f006eebba3de6676c83fe95a5914c32c507d091d Mon Sep 17 00:00:00 2001 From: Shubham Agrawal Date: Mon, 15 Feb 2021 23:19:47 +0530 Subject: [PATCH 3/3] addressed comments --- docker/Dockerfile.linux.amd64 | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index 8614ea7..6ffe938 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -1,6 +1,5 @@ FROM alpine:3.12 RUN apk add --no-cache ca-certificates git git-lfs openssh curl perl aws-cli -RUN aws --version ADD posix/* /usr/local/bin/ ENTRYPOINT ["/usr/local/bin/clone"]