From 10778050c4bcf7b0a2ac4a4d645a089a1b999e35 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Thu, 2 Jun 2022 20:00:57 -0400 Subject: [PATCH] Update build images to use python3 - Python2 sunset was January 1, 2020. Update all images to use python3 and pip3 related tools. This upgrade was already performed in Omnibus GitLab builders. Signed-off-by: Robert Marshall --- Dockerfile.gitlab-charts-build-base | 2 +- Dockerfile.gitlab-charts-build-base-helm-3 | 4 ++-- Dockerfile.gitlab-charts-build-base-helm-3.7 | 4 ++-- Dockerfile.gitlab-helm3-kubectl1.14 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.gitlab-charts-build-base b/Dockerfile.gitlab-charts-build-base index c2a54eb..63e30de 100644 --- a/Dockerfile.gitlab-charts-build-base +++ b/Dockerfile.gitlab-charts-build-base @@ -10,7 +10,7 @@ ENV KUBECTL_VERSION=1.16.4 ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl # Install dependencies -RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python2\ +RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python3\ && mkdir -p /opt # Install kubectl diff --git a/Dockerfile.gitlab-charts-build-base-helm-3 b/Dockerfile.gitlab-charts-build-base-helm-3 index 2424a84..40d30ac 100644 --- a/Dockerfile.gitlab-charts-build-base-helm-3 +++ b/Dockerfile.gitlab-charts-build-base-helm-3 @@ -10,7 +10,7 @@ ENV KUBECTL_VERSION=1.16.4 ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl # Install dependencies -RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python2 py-pip groff\ +RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python3 py3-pip groff\ && mkdir -p /opt # Install kubectl @@ -29,4 +29,4 @@ RUN mkdir -p $HELM_HOME/plugins && \ helm plugin install https://github.com/instrumenta/helm-kubeval # Install aws cli -RUN pip install awscli \ No newline at end of file +RUN pip3 install awscli diff --git a/Dockerfile.gitlab-charts-build-base-helm-3.7 b/Dockerfile.gitlab-charts-build-base-helm-3.7 index 2b879ba..046f7aa 100644 --- a/Dockerfile.gitlab-charts-build-base-helm-3.7 +++ b/Dockerfile.gitlab-charts-build-base-helm-3.7 @@ -10,7 +10,7 @@ ENV KUBECTL_VERSION=1.20.15 ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl # Install dependencies -RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python2 py-pip groff\ +RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python3 py3-pip groff\ && mkdir -p /opt # Install kubectl @@ -29,4 +29,4 @@ RUN mkdir -p $HELM_HOME/plugins && \ helm plugin install https://github.com/instrumenta/helm-kubeval # Install aws cli -RUN pip install awscli \ No newline at end of file +RUN pip3 install awscli diff --git a/Dockerfile.gitlab-helm3-kubectl1.14 b/Dockerfile.gitlab-helm3-kubectl1.14 index 2ca7ce5..b56006b 100644 --- a/Dockerfile.gitlab-helm3-kubectl1.14 +++ b/Dockerfile.gitlab-helm3-kubectl1.14 @@ -9,7 +9,7 @@ ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz ENV HELM_HOME=/root/.helm # Install dependencies -RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python2 \ +RUN apk --no-cache add -U openssl curl tar gzip bash ca-certificates git python3 \ && mkdir -p /opt # Install Google Cloud SDK