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

gitaly: Stop installing PgBouncer

Browse source 
Gitaly is using PgBouncer in its CI pipelines to verify that Praefect
works alright with this proxy for Postgres. While it was initially using
the PgBouncer binary directly, the project has since migrate to set up
PgBouncer as a service via a separate image in 0e5953177 (ci: Tie in
PgBouncer as a service, 2021-12-03). Since then the PgBouncer executable
is not needed anymore in the image used by Gitaly.

Stop installing PgBouncer and remove the architecture we have to build
and install it.
This commit is contained in:
Patrick Steinhardt 2022-07-06 07:36:57 +02:00
parent a1a1f04366
commit d87b0be061
6 changed files with 2 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile.custom
View file

@ -79,12 +79,6 @@ ARG BUILDX_DOWNLOAD_SHA256
RUN if [ -n "$BUILDX_VERSION" ]; then /scripts/install-buildx $BUILDX_VERSION $BUILDX_DOWNLOAD_SHA256; fi
# PgBouncer
ARG PGBOUNCER_VERSION
ARG PGBOUNCER_DOWNLOAD_SHA256
RUN if [ -n "$PGBOUNCER_VERSION" ] ; then /scripts/install-pgbouncer $PGBOUNCER_VERSION $PGBOUNCER_DOWNLOAD_SHA256; fi
# Bazelisk
ARG BAZELISK_VERSION
ARG BAZELISK_DOWNLOAD_SHA256
@ -127,7 +121,6 @@ ENV RUBY_VERSION=${RUBY_VERSION} \
POSTGRES_VERSION=${POSTGRES_VERSION} \
GRAPHISMAGICK_VERSION=${GRAPHISMAGICK_VERSION} \
DOCKER_VERSION=${DOCKER_VERSION} \
PGBOUNCER_VERSION=${PGBOUNCER_VERSION} \
BAZELISK_VERSION=${BAZELISK_VERSION} \
GCLOUD_VERSION=${GCLOUD_VERSION} \
KUBECTL_VERSION=${KUBECTL_VERSION} \