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

Merge branch 'upgrade-to-python-3' into 'master'

Browse source 
Update build images to use python3

See merge request gitlab-org/gitlab-build-images!547
This commit is contained in:
DJ Mountney 2022-06-03 16:09:45 +00:00
commit 1653a379b4
4 changed files with 4 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,29 +0,0 @@
FROM ruby:2.6.5-alpine
MAINTAINER GitLab Distribution Team
ENV HELM_VERSION=2.16.9
ENV HELM_URL=https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz
ENV HELM_HOME=/root/.helm
# kubectl (possibly in gcloud?)
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\
&& mkdir -p /opt
# Install kubectl
RUN curl -L -o /usr/local/bin/kubectl ${KUBECTL_URL} \
&& chmod +x /usr/local/bin/kubectl \
&& kubectl version --client
# Install Helm
RUN wget -q -O - ${HELM_URL} | tar zxf - \
&& mv linux-amd64/helm /usr/bin/ \
&& chmod +x /usr/bin/helm \
&& helm version --client
#Install kubeval
RUN mkdir -p $HELM_HOME/plugins && \
helm plugin install https://github.com/instrumenta/helm-kubeval

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

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

@ -1,36 +0,0 @@
FROM ruby:2.6.5-alpine
MAINTAINER GitLab Engineering Productivity Team
ENV GCLOUD_VERSION=286.0.0
ENV GCLOUD_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-x86_64.tar.gz
ENV HELM_VERSION=3.1.2
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 \
&& mkdir -p /opt
# Install Google Cloud SDK
RUN curl ${GCLOUD_URL} > /tmp/google-cloud-sdk.tar.gz
RUN mkdir -p /usr/local/gcloud \
&& tar -C /usr/local/gcloud -xvf /tmp/google-cloud-sdk.tar.gz \
&& /usr/local/gcloud/google-cloud-sdk/install.sh
ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin
RUN gcloud version
# Install kubectl
RUN gcloud components install kubectl \
&& kubectl version --client
# Install Helm
RUN wget -q -O - ${HELM_URL} | tar zxf - \
&& mv linux-amd64/helm /usr/bin/ \
&& chmod +x /usr/bin/helm \
&& helm version --client
# Install kubeval
RUN mkdir -p $HELM_HOME/plugins \
&& helm plugin install https://github.com/instrumenta/helm-kubeval