From 00b1a160939f2487c5dd317575040337249c40ff Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Tue, 19 Nov 2024 14:16:23 -0600 Subject: [PATCH 1/5] chore(upgrades): Update OS to latest supported releases --- Dockerfile.compile | 2 +- Dockerfile.slim | 2 +- Dockerfile.ubuntu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.compile b/Dockerfile.compile index 30b608531..cafa379a9 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -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/* diff --git a/Dockerfile.slim b/Dockerfile.slim index d2d1f9f98..aa2583d4a 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -1,4 +1,4 @@ -FROM python:3.7-alpine3.16 +FROM python:3.12-alpine3.20 LABEL maintainer="sig-platform@spinnaker.io" ARG TARGETARCH diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 91363b626..0f4ba86e5 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy LABEL maintainer="sig-platform@spinnaker.io" ARG TARGETARCH From d366ef45af26ea1d1471b97cb2264148702f6f8d Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Tue, 19 Nov 2024 14:24:31 -0600 Subject: [PATCH 2/5] chore(upgrades): Update OS to latest supported releases --- Dockerfile.slim | 2 +- Dockerfile.ubuntu | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Dockerfile.slim b/Dockerfile.slim index aa2583d4a..aa96434a2 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -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 diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 0f4ba86e5..021c1fa22 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -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 && \ From 1609d7da5d52f0954ec413d76465ccae01188f48 Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Tue, 19 Nov 2024 15:17:02 -0600 Subject: [PATCH 3/5] chore(upgrades): Update OS to latest supported releases --- Dockerfile.ubuntu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 021c1fa22..8be66b301 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -13,8 +13,8 @@ RUN apt-get update && \ curl \ wget \ python3-pip \ - python3 \ - rm -rf /var/lib/apt/lists/* --upgrade + python3 && \ + rm -rf /var/lib/apt/lists/* # AWS CLI 2 RUN if [ "${TARGETARCH}" = "arm64" ]; then \ From 9926b852a92b74167cf4fe08c78f1d237696fcf9 Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Tue, 19 Nov 2024 15:29:18 -0600 Subject: [PATCH 4/5] chore(upgrades): Update OS to latest supported releases --- Dockerfile.ubuntu | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 8be66b301..41831328a 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -14,6 +14,7 @@ RUN apt-get update && \ wget \ python3-pip \ python3 && \ + unzip && \ rm -rf /var/lib/apt/lists/* # AWS CLI 2 From 830a52e572150f2aaacc1d93f3ba56ded1b8c957 Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Tue, 19 Nov 2024 15:36:42 -0600 Subject: [PATCH 5/5] chore(upgrades): Update OS to latest supported releases --- Dockerfile.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 41831328a..664aa5b99 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -13,7 +13,7 @@ RUN apt-get update && \ curl \ wget \ python3-pip \ - python3 && \ + python3 \ unzip && \ rm -rf /var/lib/apt/lists/*