Skip to content

Commit

Permalink
chore(deps): update AWS CLI, google cloud CLI and azure CLI to latest…
Browse files Browse the repository at this point in the history 
… versions (#4574)

This backports the new methods of installing the latest versions of AWS CLI, azure CLI and Google Cloud CLI from the main branch (Bonsai).

Fixes #4571 because there is an incompatibility between AWS CLI v1 and the latest helm versions.
  • Loading branch information
@stefreak
stefreak authored Jun 8, 2023
1 parent 7d981c7 commit 708e76f
Showing 1 changed file with 117 additions and 63 deletions.
180 changes: 117 additions & 63 deletions support/alpine.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# base
# garden-base
#
FROM node:18-alpine3.17 AS garden-alpine-base
FROM node:18-alpine@sha256:f41850f74ff16a33daff988e2ea06ef8f5daeb6fb84913c7df09552a98caba09 as garden-alpine-base-root

RUN apk add --no-cache \
bash \
Expand All @@ -14,58 +14,102 @@ RUN apk add --no-cache \
tar \
gzip \
openssh-client \
libstdc++
libstdc++ \
python3 \
py3-pip \
libc6-compat \
py3-openssl \
libffi \
gnupg \
groff \
py3-crcmod

ENV USER=root
ENV HOME=/root

# Note: This is run with the dist/alpine-amd64 directory as the context root
ADD . /garden
ENTRYPOINT ["/garden/garden"]

FROM garden-alpine-base-root as garden-alpine-base

# Note: This Dockerfile is run with dist/linux-amd64 as the context root
ADD --chown=$USER:root . /garden
ENV PATH /garden:$PATH
RUN cd /garden/static && git init

WORKDIR $HOME
RUN GARDEN_DISABLE_ANALYTICS=true GARDEN_DISABLE_VERSION_CHECK=true garden util fetch-tools --all --garden-image-build

WORKDIR /project

RUN chmod +x /garden/garden \
&& ln -s /garden/garden /bin/garden \
&& chmod +x /bin/garden \
&& cd /garden/static \
&& GARDEN_DISABLE_ANALYTICS=true GARDEN_DISABLE_VERSION_CHECK=true garden util fetch-tools --all --garden-image-build --logger-type=basic
FROM python:3.11-alpine@sha256:4e8e9a59bf1b3ca8e030244bc5f801f23e41e37971907371da21191312087a07 AS aws-builder

ENTRYPOINT ["/garden/garden"]
ENV AWSCLI_VERSION=2.11.18

RUN apk add --no-cache \
curl \
make \
cmake \
gcc \
g++ \
libc-dev \
libffi-dev \
openssl-dev
RUN curl https://awscli.amazonaws.com/awscli-$AWSCLI_VERSION.tar.gz | tar -xz
RUN cd awscli-$AWSCLI_VERSION \
&& ./configure --bindir=/usr/local/bin --prefix=/aws-cli/ --with-download-deps --with-install-type=portable-exe \
&& make \
&& make install
RUN curl -o aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.15.10/2020-02-22/bin/linux/amd64/aws-iam-authenticator \
&& chmod +x ./aws-iam-authenticator \
&& mv ./aws-iam-authenticator /usr/bin/

#
# garden-aws-base
#
FROM garden-alpine-base as garden-aws-base

COPY --chown=$USER:root --from=aws-builder /aws-cli /aws-cli
COPY --chown=$USER:root --from=aws-builder /usr/bin/aws-iam-authenticator /usr/bin/aws-iam-authenticator

#
# gcloud tools
# gcloud base
#
FROM google/cloud-sdk:411.0.0-alpine as gcloud-tools
FROM google/cloud-sdk:433.0.1-alpine@sha256:cba61285346abb92a06fa80069604590d605d7dfeea69e5b9af223d20f95a69d as gcloud-base

RUN gcloud components install kubectl gke-gcloud-auth-plugin --quiet

# Clean up bloat that increases layer size unnecessarily
RUN rm -rf $(find /google-cloud-sdk/ -regex ".*/__pycache__") && rm -rf /google-cloud-sdk/.install/.backup

#
# garden-gcloud
# garden-azure-base
#
FROM garden-alpine-base as garden-gcloud
FROM garden-alpine-base-root as garden-azure-base

ENV CLOUDSDK_PYTHON=python3
WORKDIR /
ENV AZURE_CLI_VERSION=2.48.1

COPY --from=gcloud-tools /google-cloud-sdk /google-cloud-sdk
ENV PATH /google-cloud-sdk/bin:$PATH
RUN wget -O requirements.txt https://raw.githubusercontent.com/Azure/azure-cli/azure-cli-$AZURE_CLI_VERSION/src/azure-cli/requirements.py3.Linux.txt
RUN wget -O trim_sdk.py https://raw.githubusercontent.com/Azure/azure-cli/azure-cli-$AZURE_CLI_VERSION/scripts/trim_sdk.py

RUN apk add py3-virtualenv openssl-dev libffi-dev build-base python3-dev
RUN python3 -m virtualenv /azure-cli
ENV PATH /azure-cli/bin:$PATH

RUN pip install -r requirements.txt && python trim_sdk.py

RUN apk add --no-cache python3 py3-pip libc6-compat py3-openssl gnupg openssh-client py3-crcmod \
&& ln -s /google-cloud-sdk/bin/* /usr/local/bin/ \
&& chmod +x /usr/local/bin/* \
&& gcloud version
RUN ln -s /azure-cli/bin/az /usr/local/bin/az
RUN az aks install-cli

#
# garden-azure
#
FROM garden-alpine-base as garden-azure

# Build dependencies
RUN apk add --virtual=build gcc libffi-dev musl-dev openssl-dev make readline linux-pam \
# Runtime dependency
&& apk add bash sudo shadow python3-dev py3-pip && pip3 install -U pip \
# Actual azure cli
&& pip3 --no-cache-dir install azure-cli \
# Remove build dependencies
&& apk del --purge build

RUN az aks install-cli # this will install the latest version of kubelogin if you need to pin to a specific version use --kubelogin-version v0.0.20
COPY --chown=$USER:root --from=garden-azure-base /azure-cli /azure-cli
COPY --chown=$USER:root --from=garden-azure-base /usr/local/bin/az /usr/local/bin/az
COPY --chown=$USER:root --from=garden-azure-base /usr/local/bin/kubectl /usr/local/bin/kubectl
COPY --chown=$USER:root --from=garden-azure-base /usr/local/bin/kubelogin /usr/local/bin/kubelogin

# Required by Azure DevOps to tell the system where node is installed
LABEL "com.azure.dev.pipelines.agent.handler.node.path"="/usr/local/bin/node"
Expand All @@ -75,47 +119,57 @@ LABEL "com.azure.dev.pipelines.agent.handler.node.path"="/usr/local/bin/node"
#
FROM garden-alpine-base as garden-aws

RUN apk add --no-cache python3 py3-pip \
&& pip install awscli==1.22.77 --upgrade
# Copy aws cli
COPY --chown=$USER:root --from=garden-aws-base /aws-cli/lib/aws-cli /aws-cli
COPY --chown=$USER:root --from=garden-aws-base /usr/bin/aws-iam-authenticator /usr/bin
ENV PATH /aws-cli:$PATH

RUN curl -o aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.15.10/2020-02-22/bin/linux/amd64/aws-iam-authenticator \
&& chmod +x ./aws-iam-authenticator \
&& mv ./aws-iam-authenticator /usr/bin/

#
# garden-aws-gcloud
# garden-gloud
#
FROM garden-gcloud as garden-aws-gcloud
FROM garden-alpine-base as garden-gcloud

RUN pip install awscli==1.22.77 --upgrade
ENV CLOUDSDK_PYTHON=python3

RUN curl -o aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.15.10/2020-02-22/bin/linux/amd64/aws-iam-authenticator \
&& chmod +x ./aws-iam-authenticator \
&& mv ./aws-iam-authenticator /usr/bin/
COPY --chown=$USER:root --from=gcloud-base /google-cloud-sdk /google-cloud-sdk
ENV PATH /google-cloud-sdk/bin:$PATH

#
# garden-aws-gcloud-azure
# garden-aws-gloud
#
FROM garden-gcloud as garden-aws-gcloud-azure
FROM garden-alpine-base as garden-aws-gcloud

ENV KUBELOGIN_VERSION=v0.0.24
# Copy aws cli
COPY --chown=$USER:root --from=garden-aws-base /aws-cli/lib/aws-cli /aws-cli
COPY --chown=$USER:root --from=garden-aws-base /usr/bin/aws-iam-authenticator /usr/bin
ENV PATH /aws-cli:$PATH

RUN pip install awscli==1.22.77 --upgrade
ENV CLOUDSDK_PYTHON=python3

RUN curl -o aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.15.10/2020-02-22/bin/linux/amd64/aws-iam-authenticator \
&& chmod +x ./aws-iam-authenticator \
&& mv ./aws-iam-authenticator /usr/bin/
COPY --chown=$USER:root --from=gcloud-base /google-cloud-sdk /google-cloud-sdk
ENV PATH /google-cloud-sdk/bin:$PATH

# Build dependencies
RUN apk add --virtual=build gcc libffi-dev musl-dev openssl-dev make py3-pip\
# Runtime dependency
&& apk add python3-dev \
&& pip3 install virtualenv \
&& python3 -m virtualenv /azure-cli \
&& /azure-cli/bin/python -m pip --no-cache-dir install azure-cli \
&& echo "#!/usr/bin/env sh" > /usr/bin/az \
&& echo '/azure-cli/bin/python -m azure.cli "$@"' >> /usr/bin/az \
&& chmod +x /usr/bin/az \
&& wget https://github.com/Azure/kubelogin/releases/download/${KUBELOGIN_VERSION}/kubelogin-linux-amd64.zip \
&& unzip kubelogin-linux-amd64.zip \
&& cp bin/linux_amd64/kubelogin /usr/bin/

#
# garden-aws-gloud-azure
#
FROM garden-alpine-base as garden-aws-gcloud-azure

# Copy aws cli
COPY --chown=$USER:root --from=garden-aws-base /aws-cli/lib/aws-cli /aws-cli
COPY --chown=$USER:root --from=garden-aws-base /usr/bin/aws-iam-authenticator /usr/bin
ENV PATH /aws-cli:$PATH

ENV CLOUDSDK_PYTHON=python3

COPY --chown=$USER:root --from=gcloud-base /google-cloud-sdk /google-cloud-sdk
ENV PATH /google-cloud-sdk/bin:$PATH

COPY --chown=$USER:root --from=garden-azure-base /azure-cli /azure-cli
COPY --chown=$USER:root --from=garden-azure-base /usr/local/bin/az /usr/local/bin/az
COPY --chown=$USER:root --from=garden-azure-base /usr/local/bin/kubectl /usr/local/bin/kubectl
COPY --chown=$USER:root --from=garden-azure-base /usr/local/bin/kubelogin /usr/local/bin/kubelogin

# Required by Azure DevOps to tell the system where node is installed
LABEL "com.azure.dev.pipelines.agent.handler.node.path"="/usr/local/bin/node"

0 comments on commit 708e76f

Please sign in to comment.