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

* chore(upgrades): Update OS to latest supported releases * chore(upgrades): Update OS to latest supported releases * chore(upgrades): Update OS to latest supported releases * chore(upgrades): Update OS to latest supported releases * chore(upgrades): Update OS to latest supported releases
spinnaker · Nov 19, 2024 · c0b72ab · c0b72ab
1 parent 2b2dace
commit c0b72ab
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git 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
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.16
+FROM python:3.12-alpine3.20
 LABEL maintainer="[email protected]"
 ARG TARGETARCH
 
@@ -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
@@ -1,19 +1,32 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 LABEL maintainer="[email protected]"
 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 && \