NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-11 02:52:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update build images to use python3

Browse source 
- 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 <rmarshall@gitlab.com>
This commit is contained in:
Robert Marshall 2022-06-02 20:00:57 -04:00
parent b3a9491cff
commit 10778050c4
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.gitlab-charts-build-base
View file

@ -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 ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
# Install dependencies # 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 && mkdir -p /opt
# Install kubectl # Install kubectl

4
Dockerfile.gitlab-charts-build-base-helm-3
View file

@ -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 ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
# Install dependencies # 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 && mkdir -p /opt
# Install kubectl # Install kubectl
@ -29,4 +29,4 @@ RUN mkdir -p $HELM_HOME/plugins && \
helm plugin install https://github.com/instrumenta/helm-kubeval helm plugin install https://github.com/instrumenta/helm-kubeval
# Install aws cli # Install aws cli
RUN pip install awscli RUN pip3 install awscli

4
Dockerfile.gitlab-charts-build-base-helm-3.7
View file

@ -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 ENV KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
# Install dependencies # 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 && mkdir -p /opt
# Install kubectl # Install kubectl
@ -29,4 +29,4 @@ RUN mkdir -p $HELM_HOME/plugins && \
helm plugin install https://github.com/instrumenta/helm-kubeval helm plugin install https://github.com/instrumenta/helm-kubeval
# Install aws cli # Install aws cli
RUN pip install awscli RUN pip3 install awscli

2
Dockerfile.gitlab-helm3-kubectl1.14
View file

@ -9,7 +9,7 @@ ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz
ENV HELM_HOME=/root/.helm ENV HELM_HOME=/root/.helm
# Install dependencies # 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 && mkdir -p /opt
# Install Google Cloud SDK # Install Google Cloud SDK