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 'pks-fix-pgbouncer-build' into 'master'

Browse source 
scripts: Install libevent-dev dependency to fix pgbouncer build

See merge request gitlab-org/gitlab-build-images!386
This commit is contained in:
Zeger-Jan van de Weg 2021-03-16 10:10:47 +00:00
commit 587926665e
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/install-essentials
View file

@ -22,7 +22,7 @@ then
logrotate python-docutils pkg-config cmake nodejs \ logrotate python-docutils pkg-config cmake nodejs \
libkrb5-dev postgresql-client mysql-client unzip \ libkrb5-dev postgresql-client mysql-client unzip \
libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \ libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \
libre2-dev gettext rsync git-core libre2-dev libevent-dev gettext rsync git-core
else else
apt-get install -y \ apt-get install -y \
curl wget build-essential apt-utils locales openssh-client \ curl wget build-essential apt-utils locales openssh-client \
@ -32,7 +32,7 @@ else
logrotate python-docutils pkg-config cmake \ logrotate python-docutils pkg-config cmake \
libkrb5-dev postgresql-client unzip \ libkrb5-dev postgresql-client unzip \
libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \ libsqlite3-dev libpq-dev libpng-dev libjpeg-dev libzstd-dev \
libre2-dev gettext rsync git-core libre2-dev libevent-dev gettext rsync git-core
fi fi
# Set UTF-8 # Set UTF-8

25
scripts/install-pgbouncer
View file

@ -1,19 +1,18 @@
#!/bin/bash #!/bin/bash
set -xeuo pipefail
PGBOUNCER_VERSION=${1} PGBOUNCER_VERSION=${1}
PGBOUNCER_DOWNLOAD_SHA256=${2} PGBOUNCER_DOWNLOAD_SHA256=${2}
PGBOUNCER_DOWNLOAD_URL="https://pgbouncer.github.io/downloads/files/$PGBOUNCER_VERSION/pgbouncer-$PGBOUNCER_VERSION.tar.gz" PGBOUNCER_DOWNLOAD_URL="https://pgbouncer.github.io/downloads/files/$PGBOUNCER_VERSION/pgbouncer-$PGBOUNCER_VERSION.tar.gz"
curl -o pgbouncer.tar.gz -fsSL $PGBOUNCER_DOWNLOAD_URL curl -o pgbouncer.tar.gz -fsSL $PGBOUNCER_DOWNLOAD_URL \
echo "${PGBOUNCER_DOWNLOAD_SHA256} pgbouncer.tar.gz" | sha256sum -c - && echo "${PGBOUNCER_DOWNLOAD_SHA256} pgbouncer.tar.gz" | sha256sum -c - \
&& tar xfz pgbouncer.tar.gz \
tar xfz pgbouncer.tar.gz && rm -f pgbouncer.tar.gz \
rm -f pgbouncer.tar.gz && cd pgbouncer-${PGBOUNCER_VERSION} \
cd pgbouncer-${PGBOUNCER_VERSION} && ./configure --prefix=/usr/local \
./configure --prefix=/usr/local && make \
make && cp pgbouncer /usr/local/bin \
cp pgbouncer /usr/local/bin && cd .. \
&& rm -rf pgbouncer-${PGBOUNCER_VERSION}
cd ..
rm -rf pgbouncer-${PGBOUNCER_VERSION}