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

Fix PostgreSQL build errors

Browse source
This commit is contained in:
Stan Hu 2018-05-26 13:50:49 -07:00
parent fa197e302c
commit 6e27b42922
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile.custom
View file

@ -38,10 +38,8 @@ ARG GOLANG_DOWNLOAD_SHA256
RUN if [ -n "$INSTALL_GOLANG_VERSION" ] ; then /scripts/install-golang "${INSTALL_GOLANG_VERSION}" "${GOLANG_DOWNLOAD_SHA256}" && go version; fi
# Postgres
# Codedebt: currently this will only install the default version of postgres,
# not the stipulated version
ARG POSTGRES_VERSION
RUN if [ -n "$POSTGRES_VERSION" ] ; then /scripts/install-postgresql; fi
RUN if [ -n "$POSTGRES_VERSION" ] ; then /scripts/install-postgresql $POSTGRES_VERSION; fi
# Ansible
ARG ANSIBLE_VERSION

3
scripts/install-postgresql
View file

@ -2,10 +2,11 @@
set -xeuo pipefail
IFS=$'\n\t'
POSTGRES_VERSION=${1:-9.6}
export DEBIAN_FRONTEND=noninteractive
curl -sS -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" | tee /etc/apt/sources.list.d/postgresql.list
echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg ${POSTGRES_VERSION}" | tee /etc/apt/sources.list.d/postgresql.list
apt-get update
apt-get install -y postgresql-client