openstack
/
openstack-helm-images
Code Issues Proposed changes

Pin Patroni to v1.5.6 

Pin the version of Patroni to v1.5.6 to prevent any issues that may
arise with using an new, untested version.

Change-Id: Iea6b2e57b3a0319e8bcf98d23619d824cae97349
This commit is contained in:
Doug Aaser 2019-08-26 15:15:05 +00:00
parent e79f83d91d
commit 343175b16e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patroni/Dockerfile.ubuntu_xenial
View File

@ -1,6 +1,8 @@
FROM postgres:9.5
MAINTAINER Alexander Kukushkin <alexander.kukushkin@zalando.de>
ARG PATRONI_VERSION
RUN export DEBIAN_FRONTEND=noninteractive \
&& echo 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommend \
&& apt-get update -y \
@ -11,7 +13,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
## Make sure we have a en_US.UTF-8 locale available
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
&& pip3 install setuptools \
&& pip3 install 'git+https://github.com/zalando/patroni.git#egg=patroni[kubernetes]' \
&& pip3 install "git+https://github.com/zalando/patroni.git@${PATRONI_VERSION}#egg=patroni[kubernetes]" \
&& PGHOME=/home/postgres \
&& mkdir -p $PGHOME \
&& chown postgres $PGHOME \

8
patroni/build.sh
View File

@ -9,6 +9,12 @@ VERSION=${VERSION:-latest}
DISTRO=${DISTRO:-ubuntu_xenial}
REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE}
PATRONI_VERSION=${PATRONI_VERSION:-v1.5.6}
docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host \
-t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} \
--build-arg PATRONI_VERSION=${PATRONI_VERSION} \
${extra_build_args} ${IMAGE}
cd -