You've already forked postgres
mirror of
https://github.com/docker-library/postgres.git
synced 2025-07-28 10:42:06 +03:00
Remove UUID variability now that 9.3 is gone (per comment in "update.sh")
This commit is contained in:
@ -25,7 +25,6 @@ ENV PG_MAJOR %%PG_MAJOR%%
|
|||||||
ENV PG_VERSION %%PG_VERSION%%
|
ENV PG_VERSION %%PG_VERSION%%
|
||||||
ENV PG_SHA256 %%PG_SHA256%%
|
ENV PG_SHA256 %%PG_SHA256%%
|
||||||
|
|
||||||
%%OSSP_UUID_ENV_VARS%%
|
|
||||||
RUN set -ex \
|
RUN set -ex \
|
||||||
\
|
\
|
||||||
&& apk add --no-cache --virtual .fetch-deps \
|
&& apk add --no-cache --virtual .fetch-deps \
|
||||||
@ -69,7 +68,6 @@ RUN set -ex \
|
|||||||
zlib-dev \
|
zlib-dev \
|
||||||
icu-dev \
|
icu-dev \
|
||||||
\
|
\
|
||||||
%%INSTALL_OSSP_UUID%%
|
|
||||||
&& cd /usr/src/postgresql \
|
&& cd /usr/src/postgresql \
|
||||||
# update "DEFAULT_PGSOCKET_DIR" to "/var/run/postgresql" (matching Debian)
|
# update "DEFAULT_PGSOCKET_DIR" to "/var/run/postgresql" (matching Debian)
|
||||||
# see https://anonscm.debian.org/git/pkg-postgresql/postgresql.git/tree/debian/patches/51-default-sockets-in-var.patch?id=8b539fcb3e093a521c095e70bdfa76887217b89f
|
# see https://anonscm.debian.org/git/pkg-postgresql/postgresql.git/tree/debian/patches/51-default-sockets-in-var.patch?id=8b539fcb3e093a521c095e70bdfa76887217b89f
|
||||||
@ -92,7 +90,7 @@ RUN set -ex \
|
|||||||
# skip debugging info -- we want tiny size instead
|
# skip debugging info -- we want tiny size instead
|
||||||
# --enable-debug \
|
# --enable-debug \
|
||||||
--disable-rpath \
|
--disable-rpath \
|
||||||
%%UUID_CONFIG_FLAG%% \
|
--with-uuid=e2fs \
|
||||||
--with-gnu-ld \
|
--with-gnu-ld \
|
||||||
--with-pgport=5432 \
|
--with-pgport=5432 \
|
||||||
--with-system-tzdata=/usr/share/zoneinfo \
|
--with-system-tzdata=/usr/share/zoneinfo \
|
||||||
|
23
update.sh
23
update.sh
@ -92,29 +92,6 @@ for version in "${versions[@]}"; do
|
|||||||
sed -i -e '/icu/d' "$version/$variant/Dockerfile"
|
sed -i -e '/icu/d' "$version/$variant/Dockerfile"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# TODO remove all this when 9.3 is EOL (2018-10-01 -- from http://www.postgresql.org/support/versioning/)
|
|
||||||
case "$version" in
|
|
||||||
9.3)
|
|
||||||
uuidConfigFlag='--with-ossp-uuid'
|
|
||||||
sed -i \
|
|
||||||
-e 's/%%OSSP_UUID_ENV_VARS%%/ENV OSSP_UUID_VERSION '"$osspUuidVersion"'\nENV OSSP_UUID_SHA256 '"$osspUuidHash"'\n/' \
|
|
||||||
-e $'/%%INSTALL_OSSP_UUID%%/ {r ossp-uuid.template\n d}' \
|
|
||||||
"$version/$variant/Dockerfile"
|
|
||||||
|
|
||||||
# configure: WARNING: unrecognized options: --enable-tap-tests
|
|
||||||
sed -i '/--enable-tap-tests/d' "$version/$variant/Dockerfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
uuidConfigFlag='--with-uuid=e2fs'
|
|
||||||
sed -i \
|
|
||||||
-e '/%%OSSP_UUID_ENV_VARS%%/d' \
|
|
||||||
-e '/%%INSTALL_OSSP_UUID%%/d' \
|
|
||||||
"$version/$variant/Dockerfile"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
sed -i 's/%%UUID_CONFIG_FLAG%%/'"$uuidConfigFlag"'/' "$version/$variant/Dockerfile"
|
|
||||||
|
|
||||||
travisEnv="\n - VERSION=$version VARIANT=$variant$travisEnv"
|
travisEnv="\n - VERSION=$version VARIANT=$variant$travisEnv"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user