Skip to content

Commit

Permalink
chore(upgrades): Update OS to latest supported releases
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonmcintosh committed Nov 19, 2024
1 parent 8e5e7ad commit d366ef4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.slim
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN apk --no-cache add --update \
curl \
openjdk17-jre \
openssl \
&& pip install --upgrade awscli==${AWS_CLI_VERSION} \
&& pip3 install --upgrade awscli==${AWS_CLI_VERSION} \
&& apk --purge del \
&& rm -rf /var/cache/apk

Expand Down
20 changes: 16 additions & 4 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,28 @@ ARG TARGETARCH

ENV KUBECTL_RELEASE=1.15.10
ENV AWS_BINARY_RELEASE_DATE=2020-02-22
ENV AWS_CLI_VERSION=1.18.18
ENV AWS_CLI_VERSION=2.15.57

RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y \
openjdk-17-jre-headless \
curl \
python-pip && \
rm -rf /var/lib/apt/lists/* && \
pip install awscli==${AWS_CLI_VERSION} --upgrade
wget \
python3-pip \
python3 \
rm -rf /var/lib/apt/lists/* --upgrade

# AWS CLI 2
RUN if [ "${TARGETARCH}" = "arm64" ]; then \
wget -nv -O "awscliv2.zip" "https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${AWS_CLI_VERSION}.zip"; \
else \
wget -nv -O "awscliv2.zip" "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip"; \
fi && \
unzip awscliv2.zip && \
./aws/install && \
rm -rf ./awscliv2.zip ./aws


RUN echo '#!/usr/bin/env bash' > /usr/local/bin/hal && \
echo '/opt/halyard/bin/hal "$@"' >> /usr/local/bin/hal && \
Expand Down

0 comments on commit d366ef4

Please sign in to comment.