From adfec635268de089f04c1a4a5d1244ccbce201ae Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Mon, 28 Nov 2022 11:53:07 -0300 Subject: [PATCH] 19215: Sets up the provision.sh script to use our own postgres formula fork. This is a temporary measure until it gets properly fixed. See: https://github.com/saltstack-formulas/postgres-formula/issues/327 Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- tools/salt-install/provision.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index 63e2d886ac..77c2016151 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -211,7 +211,10 @@ VERSION="latest" SALT_VERSION="3004" # Other formula versions we depend on -POSTGRES_TAG="v0.44.0" +#POSTGRES_TAG="v0.44.0" +#POSTGRES_URL="https://github.com/saltstack-formulas/postgres-formula.git" +POSTGRES_TAG="0.45.0-bugfix327" +POSTGRES_URL="https://github.com/arvados/postgres-formula.git" NGINX_TAG="v2.8.1" DOCKER_TAG="v2.4.2" LOCALE_TAG="v0.3.4" @@ -352,7 +355,7 @@ test -d nginx && ( cd nginx && git fetch ) \ echo "...postgres" test -d postgres && ( cd postgres && git fetch ) \ - || git clone --quiet https://github.com/saltstack-formulas/postgres-formula.git ${F_DIR}/postgres + || git clone --quiet ${POSTGRES_URL} ${F_DIR}/postgres ( cd postgres && git checkout --quiet tags/"${POSTGRES_TAG}" ) echo "...letsencrypt" -- 2.39.5