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

Update Dockerfile.custom

Browse source
This commit is contained in:
Andrejs Cunskis 2022-04-28 19:38:02 +03:00
parent 9906770111
commit 06a761ebf6
No known key found for this signature in database
GPG key ID: 87CB75083F227241
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dockerfile.custom
View file

@ -83,6 +83,16 @@ ARG BAZELISK_DOWNLOAD_SHA256
RUN if [ -n "$BAZELISK_VERSION" ] ; then /scripts/install-bazelisk $BAZELISK_VERSION $BAZELISK_DOWNLOAD_SHA256; fi
# GCLOUD
ARG GCLOUD_VERSION
RUN if [ -n "$GCLOUD_VERSION" ] ; then /scripts/install-gcloud $GCLOUD_VERSION; fi
# GCLOUD
ARG KUBECTL_VERSION
RUN if [ -n "$KUBECTL_VERSION" ] ; then /scripts/install-kubectl $KUBECTL_VERSION; fi
RUN locale-gen C.UTF-8
ENV LANG=C.UTF-8 \
LANGUAGE=C \
@ -101,4 +111,6 @@ ENV RUBY_VERSION=${RUBY_VERSION} \
DOCKER_VERSION=${DOCKER_VERSION} \
PGBOUNCER_VERSION=${PGBOUNCER_VERSION} \
BAZELISK_VERSION=${BAZELISK_VERSION} \
GCLOUD_VERSION=${GCLOUD_VERSION} \
KUBECTL_VERSION=${KUBECTL_VERSION} \
DEBIAN_VERSION=${DEBIAN_VERSION}

2
scripts/install-gcloud
View file

@ -9,8 +9,6 @@ GCLOUD_VERSION=${1}
apt-get update
apt-get -y install \
apt-transport-https \
ca-certificates \
curl \
python3 \
gnupg

2
scripts/lib/custom-docker.sh
View file

@ -1,4 +1,4 @@
TOOLS=(DEBIAN RUBY GOLANG GIT LFS CHROME NODE YARN POSTGRESQL GRAPHICSMAGICK PGBOUNCER BAZELISK)
TOOLS=(DEBIAN RUBY GOLANG GIT LFS CHROME NODE YARN POSTGRESQL GRAPHICSMAGICK PGBOUNCER BAZELISK GCLOUD KUBECTL)
function get_image_name(){
local IMAGE_NAME