Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(upgrades): Update OS to latest supported releases #2194

Merged
merged 6 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.compile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:jammy
RUN apt-get update && apt-get install -y \
openjdk-17-jdk \
&& rm -rf /var/lib/apt/lists/*
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-alpine3.16
FROM python:3.12-alpine3.20
LABEL maintainer="sig-platform@spinnaker.io"
ARG TARGETARCH

Expand All @@ -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
23 changes: 18 additions & 5 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,19 +1,32 @@
FROM ubuntu:bionic
FROM ubuntu:jammy
LABEL maintainer="sig-platform@spinnaker.io"
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 \
unzip && \
rm -rf /var/lib/apt/lists/*

# 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