docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-11-17 13:02:40 +03:00
Code Activity

Merge pull request #470 from dtrebbien/build-with-icu

Browse Source 
Build with the ICU collation provider
This commit is contained in:
Tianon Gravi
2018-07-27 13:06:54 -07:00
committed by GitHub
parent 2cab504034 498a243ce3
commit 639f83fb14
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
10/alpine/Dockerfile
View File

@@ -66,6 +66,7 @@ RUN set -ex \
# tcl-dev \ # tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
icu-dev \
\ \
&& 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)
@@ -108,6 +109,7 @@ RUN set -ex \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
--with-libxslt \ --with-libxslt \
--with-icu \
&& make -j "$(nproc)" world \ && make -j "$(nproc)" world \
&& make install-world \ && make install-world \
&& make -C contrib install \ && make -C contrib install \

2
11/alpine/Dockerfile
View File

@@ -66,6 +66,7 @@ RUN set -ex \
# tcl-dev \ # tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
icu-dev \
\ \
&& 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)
@@ -108,6 +109,7 @@ RUN set -ex \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
--with-libxslt \ --with-libxslt \
--with-icu \
&& make -j "$(nproc)" world \ && make -j "$(nproc)" world \
&& make install-world \ && make install-world \
&& make -C contrib install \ && make -C contrib install \

2
Dockerfile-alpine.template
View File

@@ -67,6 +67,7 @@ RUN set -ex \
# tcl-dev \ # tcl-dev \
util-linux-dev \ util-linux-dev \
zlib-dev \ zlib-dev \
icu-dev \
\ \
%%INSTALL_OSSP_UUID%% %%INSTALL_OSSP_UUID%%
&& cd /usr/src/postgresql \ && cd /usr/src/postgresql \
@@ -110,6 +111,7 @@ RUN set -ex \
--with-openssl \ --with-openssl \
--with-libxml \ --with-libxml \
--with-libxslt \ --with-libxslt \
--with-icu \
&& make -j "$(nproc)" world \ && make -j "$(nproc)" world \
&& make install-world \ && make install-world \
&& make -C contrib install \ && make -C contrib install \

4
update.sh
View File

@@ -53,6 +53,8 @@ for version in "${versions[@]}"; do
sed -i -e 's/WALDIR/XLOGDIR/g' \ sed -i -e 's/WALDIR/XLOGDIR/g' \
-e 's/waldir/xlogdir/g' \ -e 's/waldir/xlogdir/g' \
"$version/docker-entrypoint.sh" "$version/docker-entrypoint.sh"
# ICU support was introduced in PostgreSQL 10 (https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13)
sed -i -e '/icu/d' "$version/Dockerfile"
else else
# postgresql-contrib-10 package does not exist, but is provided by postgresql-10 # postgresql-contrib-10 package does not exist, but is provided by postgresql-10
# Packages.gz: # Packages.gz:
@@ -85,6 +87,8 @@ for version in "${versions[@]}"; do
sed -i -e 's/WALDIR/XLOGDIR/g' \ sed -i -e 's/WALDIR/XLOGDIR/g' \
-e 's/waldir/xlogdir/g' \ -e 's/waldir/xlogdir/g' \
"$version/$variant/docker-entrypoint.sh" "$version/$variant/docker-entrypoint.sh"
# ICU support was introduced in PostgreSQL 10 (https://www.postgresql.org/docs/10/static/release-10.html#id-1.11.6.9.5.13)
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/) # TODO remove all this when 9.3 is EOL (2018-10-01 -- from http://www.postgresql.org/support/versioning/)