Skip to content

Commit d158e21

Browse files
tianontianon
committed
Adjust "update.sh" output to be more concise
1 parent 639f83f commit d158e21

File tree

1 file changed

+61
-63
lines changed

1 file changed

+61
-63
lines changed

‎update.sh‎

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,28 @@ for version in "${versions[@]}"; do
4040
fullVersion="$(echo "$versionList" | awk -F ': ' '$1 == "Package" { pkg = $2 } $1 == "Version" && pkg == "postgresql-'"$version"'" { print $2; exit }' || true)"
4141
majorVersion="${version%%.*}"
4242

43-
(
44-
set -x
45-
cp docker-entrypoint.sh "$version/"
46-
sed -e 's/%%PG_MAJOR%%/'"$version"'/g;' \
47-
-e 's/%%PG_VERSION%%/'"$fullVersion"'/g' \
48-
-e 's/%%DEBIAN_TAG%%/'"$tag"'/g' \
49-
-e 's/%%DEBIAN_SUITE%%/'"$suite"'/g' \
50-
-e 's/%%ARCH_LIST%%/'"${suiteArches["$suite"]}"'/g' \
51-
Dockerfile-debian.template > "$version/Dockerfile"
52-
if [ "$majorVersion" = '9' ]; then
53-
sed -i -e 's/WALDIR/XLOGDIR/g' \
54-
-e 's/waldir/xlogdir/g' \
55-
"$version/docker-entrypoint.sh"
56-
# ICU support was introduced in PostgreSQL 10 (https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13)
57-
sed -i -e '/icu/d' "$version/Dockerfile"
58-
else
59-
# postgresql-contrib-10 package does not exist, but is provided by postgresql-10
60-
# Packages.gz:
61-
# Package: postgresql-10
62-
# Provides: postgresql-contrib-10
63-
sed -i -e '/postgresql-contrib-/d' "$version/Dockerfile"
64-
fi
65-
)
43+
echo "$version: $fullVersion"
44+
45+
cp docker-entrypoint.sh "$version/"
46+
sed -e 's/%%PG_MAJOR%%/'"$version"'/g;' \
47+
-e 's/%%PG_VERSION%%/'"$fullVersion"'/g' \
48+
-e 's/%%DEBIAN_TAG%%/'"$tag"'/g' \
49+
-e 's/%%DEBIAN_SUITE%%/'"$suite"'/g' \
50+
-e 's/%%ARCH_LIST%%/'"${suiteArches["$suite"]}"'/g' \
51+
Dockerfile-debian.template > "$version/Dockerfile"
52+
if [ "$majorVersion" = '9' ]; then
53+
sed -i -e 's/WALDIR/XLOGDIR/g' \
54+
-e 's/waldir/xlogdir/g' \
55+
"$version/docker-entrypoint.sh"
56+
# ICU support was introduced in PostgreSQL 10 (https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13)
57+
sed -i -e '/icu/d' "$version/Dockerfile"
58+
else
59+
# postgresql-contrib-10 package does not exist, but is provided by postgresql-10
60+
# Packages.gz:
61+
# Package: postgresql-10
62+
# Provides: postgresql-contrib-10
63+
sed -i -e '/postgresql-contrib-/d' "$version/Dockerfile"
64+
fi
6665

6766
# TODO figure out what to do with odd version numbers here, like release candidates
6867
srcVersion="${fullVersion%%-*}"
@@ -74,46 +73,45 @@ for version in "${versions[@]}"; do
7473
if [ ! -d "$version/$variant" ]; then
7574
continue
7675
fi
77-
(
78-
set -x
79-
cp docker-entrypoint.sh "$version/$variant/"
80-
sed -i 's/gosu/su-exec/g' "$version/$variant/docker-entrypoint.sh"
81-
sed -e 's/%%PG_MAJOR%%/'"$version"'/g' \
82-
-e 's/%%PG_VERSION%%/'"$srcVersion"'/g' \
83-
-e 's/%%PG_SHA256%%/'"$srcSha256"'/g' \
84-
-e 's/%%ALPINE-VERSION%%/'"${alpineVersion[$version]:-$defaultAlpineVersion}"'/g' \
85-
"Dockerfile-$variant.template" > "$version/$variant/Dockerfile"
86-
if [ "$majorVersion" = '9' ]; then
87-
sed -i -e 's/WALDIR/XLOGDIR/g' \
88-
-e 's/waldir/xlogdir/g' \
89-
"$version/$variant/docker-entrypoint.sh"
90-
# ICU support was introduced in PostgreSQL 10 (https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13)
91-
sed -i -e '/icu/d' "$version/$variant/Dockerfile"
92-
fi
93-
94-
# TODO remove all this when 9.3 is EOL (2018-10-01 -- from http://www.postgresql.org/support/versioning/)
95-
case "$version" in
96-
9.3)
97-
uuidConfigFlag='--with-ossp-uuid'
98-
sed -i \
99-
-e 's/%%OSSP_UUID_ENV_VARS%%/ENV OSSP_UUID_VERSION '"$osspUuidVersion"'\nENV OSSP_UUID_SHA256 '"$osspUuidHash"'\n/' \
100-
-e $'/%%INSTALL_OSSP_UUID%%/ {r ossp-uuid.template\n d}' \
101-
"$version/$variant/Dockerfile"
102-
103-
# configure: WARNING: unrecognized options: --enable-tap-tests
104-
sed -i '/--enable-tap-tests/d' "$version/$variant/Dockerfile"
105-
;;
106-
107-
*)
108-
uuidConfigFlag='--with-uuid=e2fs'
109-
sed -i \
110-
-e '/%%OSSP_UUID_ENV_VARS%%/d' \
111-
-e '/%%INSTALL_OSSP_UUID%%/d' \
112-
"$version/$variant/Dockerfile"
113-
;;
114-
esac
115-
sed -i 's/%%UUID_CONFIG_FLAG%%/'"$uuidConfigFlag"'/' "$version/$variant/Dockerfile"
116-
)
76+
77+
cp docker-entrypoint.sh "$version/$variant/"
78+
sed -i 's/gosu/su-exec/g' "$version/$variant/docker-entrypoint.sh"
79+
sed -e 's/%%PG_MAJOR%%/'"$version"'/g' \
80+
-e 's/%%PG_VERSION%%/'"$srcVersion"'/g' \
81+
-e 's/%%PG_SHA256%%/'"$srcSha256"'/g' \
82+
-e 's/%%ALPINE-VERSION%%/'"${alpineVersion[$version]:-$defaultAlpineVersion}"'/g' \
83+
"Dockerfile-$variant.template" > "$version/$variant/Dockerfile"
84+
if [ "$majorVersion" = '9' ]; then
85+
sed -i -e 's/WALDIR/XLOGDIR/g' \
86+
-e 's/waldir/xlogdir/g' \
87+
"$version/$variant/docker-entrypoint.sh"
88+
# ICU support was introduced in PostgreSQL 10 (https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13)
89+
sed -i -e '/icu/d' "$version/$variant/Dockerfile"
90+
fi
91+
92+
# TODO remove all this when 9.3 is EOL (2018-10-01 -- from http://www.postgresql.org/support/versioning/)
93+
case "$version" in
94+
9.3)
95+
uuidConfigFlag='--with-ossp-uuid'
96+
sed -i \
97+
-e 's/%%OSSP_UUID_ENV_VARS%%/ENV OSSP_UUID_VERSION '"$osspUuidVersion"'\nENV OSSP_UUID_SHA256 '"$osspUuidHash"'\n/' \
98+
-e $'/%%INSTALL_OSSP_UUID%%/ {r ossp-uuid.template\n d}' \
99+
"$version/$variant/Dockerfile"
100+
101+
# configure: WARNING: unrecognized options: --enable-tap-tests
102+
sed -i '/--enable-tap-tests/d' "$version/$variant/Dockerfile"
103+
;;
104+
105+
*)
106+
uuidConfigFlag='--with-uuid=e2fs'
107+
sed -i \
108+
-e '/%%OSSP_UUID_ENV_VARS%%/d' \
109+
-e '/%%INSTALL_OSSP_UUID%%/d' \
110+
"$version/$variant/Dockerfile"
111+
;;
112+
esac
113+
sed -i 's/%%UUID_CONFIG_FLAG%%/'"$uuidConfigFlag"'/' "$version/$variant/Dockerfile"
114+
117115
travisEnv="\n - VERSION=$version VARIANT=$variant$travisEnv"
118116
done
119117

0 commit comments

Comments
 (0)