Skip to content

Commit

Permalink
chore(upgrades): Upgrade Ubuntu to latest release and fixes aws cli i… (
Browse files Browse the repository at this point in the history
#5996)

* chore(upgrades): Upgrade Ubuntu to latest release and fixes aws cli installer to match slim version

* fix(typo): Fix removing pip had a typo
  • Loading branch information
jasonmcintosh authored Aug 23, 2023
1 parent bdcb8ad commit 7cd3a9d
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM ubuntu:bionic
FROM ubuntu:jammy
LABEL maintainer="sig-platform@spinnaker.io"
ARG TARGETARCH
ENV GOOGLE_CLOUD_SDK_VERSION=412.0.0
ENV PATH "$PATH:/opt/google-cloud-sdk/bin/"
ENV AWS_CLI_VERSION=1.22
ENV AWS_CLI_S3_CMD=2.0.2

RUN apt-get update && apt-get install -y curl gnupg && \
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
Expand All @@ -13,13 +15,16 @@ RUN apt-get update && apt-get install -y curl gnupg && \
openjdk-11-jre-headless \
wget \
kubectl \
python-pip \
python3-pip \
python3 \
git \
openssh-client && \
pip install awscli==1.18.152 --upgrade && \
rm -rf ~/.config/gcloud

# AWS CLI
RUN pip install --upgrade --no-build-isolation awscli==${AWS_CLI_VERSION} s3cmd==${AWS_CLI_S3_CMD} python-magic \
&& apt remove -y python3-pip

RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.16.8/2020-04-16/bin/linux/${TARGETARCH}/aws-iam-authenticator && \
chmod +x /usr/local/bin/aws-iam-authenticator && \
ln -s /usr/local/bin/aws-iam-authenticator /usr/local/bin/heptio-authenticator-aws
Expand Down

0 comments on commit 7cd3a9d

Please sign in to comment.