scottk/openstack-helm-images
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/openstack-helm-images.git synced 2025-12-30 18:31:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Pin Patroni to v1.5.6"

Browse Source
This commit is contained in:
Zuul
2019-11-11 07:34:28 +00:00
committed by Gerrit Code Review
parent 8d8c3e7158 343175b16e
commit 0766aa50aa
2 changed files with 10 additions and 2 deletions
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 -