From 2c72165e4f9dc66a61998111f69b5eba0b6b71f4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 7 Jan 2016 10:27:31 -0800 Subject: [PATCH] Update to 9.5.0 --- 9.5/Dockerfile | 2 +- generate-stackbrew-library.sh | 2 +- update.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 097750362c..d23eb7a240 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -24,7 +24,7 @@ RUN mkdir /docker-entrypoint-initdb.d RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8 ENV PG_MAJOR 9.5 -ENV PG_VERSION 9.5~rc1-1.pgdg80+1 +ENV PG_VERSION 9.5.0-1.pgdg80+2 RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 109ccb86c3..17a9994eb7 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -3,7 +3,7 @@ set -e declare -A aliases aliases=( - [9.4]='9 latest' + [9.5]='9 latest' ) cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" diff --git a/update.sh b/update.sh index 238abc50c1..3b709ab66a 100755 --- a/update.sh +++ b/update.sh @@ -15,11 +15,11 @@ mainList="$(curl -fsSL "$packagesBase/main/binary-amd64/Packages.bz2" | bunzip2) travisEnv= for version in "${versions[@]}"; do versionList="$(echo "$mainList"; curl -fsSL "$packagesBase/$version/binary-amd64/Packages.bz2" | bunzip2)" - fullVersion="$(echo "$versionList" | awk -F ': ' '$1 == "Package" { pkg = $2 } $1 == "Version" && pkg == "postgresql-'"$version"'" { print $2 }')" + fullVersion="$(echo "$versionList" | awk -F ': ' '$1 == "Package" { pkg = $2 } $1 == "Version" && pkg == "postgresql-'"$version"'" { print $2; exit }' || true)" ( set -x cp docker-entrypoint.sh "$version/" - sed 's/%%PG_MAJOR%%/'$version'/g; s/%%PG_VERSION%%/'$fullVersion'/g' Dockerfile.template > "$version/Dockerfile" + sed 's/%%PG_MAJOR%%/'"$version"'/g; s/%%PG_VERSION%%/'"$fullVersion"'/g' Dockerfile.template > "$version/Dockerfile" ) travisEnv='\n - VERSION='"$version$travisEnv"