docker-images/postgres
1
0
Fork 0
mirror of https://github.com/docker-library/postgres.git synced 2025-07-28 10:42:06 +03:00
Code Activity

Add explicit "--build" to our "./configure" invocations

Browse Source
This commit is contained in:
Tianon Gravi
2017-05-10 10:19:28 -07:00
parent 5fddf91c23
commit bc44222ff8
17 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
9.2/alpine/Dockerfile
View File

@ -48,6 +48,7 @@ RUN set -ex \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
bison \ bison \
coreutils \ coreutils \
dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ # krb5-dev \
@ -92,9 +93,11 @@ RUN set -ex \
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \ && awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
# configure options taken from: # configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
&& ./configure \ && ./configure \
--build="$gnuArch" \
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
# --enable-nls \ # --enable-nls \
--enable-integer-datetimes \ --enable-integer-datetimes \

2
9.2/alpine/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

2
9.2/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

3
9.3/alpine/Dockerfile
View File

@ -48,6 +48,7 @@ RUN set -ex \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
bison \ bison \
coreutils \ coreutils \
dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ # krb5-dev \
@ -92,9 +93,11 @@ RUN set -ex \
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \ && awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
# configure options taken from: # configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
&& ./configure \ && ./configure \
--build="$gnuArch" \
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
# --enable-nls \ # --enable-nls \
--enable-integer-datetimes \ --enable-integer-datetimes \

2
9.3/alpine/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

2
9.3/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

3
9.4/alpine/Dockerfile
View File

@ -45,6 +45,7 @@ RUN set -ex \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
bison \ bison \
coreutils \ coreutils \
dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ # krb5-dev \
@ -69,9 +70,11 @@ RUN set -ex \
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \ && awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
# configure options taken from: # configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
&& ./configure \ && ./configure \
--build="$gnuArch" \
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
# --enable-nls \ # --enable-nls \
--enable-integer-datetimes \ --enable-integer-datetimes \

2
9.4/alpine/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

2
9.4/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

3
9.5/alpine/Dockerfile
View File

@ -45,6 +45,7 @@ RUN set -ex \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
bison \ bison \
coreutils \ coreutils \
dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ # krb5-dev \
@ -69,9 +70,11 @@ RUN set -ex \
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \ && awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
# configure options taken from: # configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
&& ./configure \ && ./configure \
--build="$gnuArch" \
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
# --enable-nls \ # --enable-nls \
--enable-integer-datetimes \ --enable-integer-datetimes \

2
9.5/alpine/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

2
9.5/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

3
9.6/alpine/Dockerfile
View File

@ -45,6 +45,7 @@ RUN set -ex \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
bison \ bison \
coreutils \ coreutils \
dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ # krb5-dev \
@ -69,9 +70,11 @@ RUN set -ex \
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \ && awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
# configure options taken from: # configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
&& ./configure \ && ./configure \
--build="$gnuArch" \
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
# --enable-nls \ # --enable-nls \
--enable-integer-datetimes \ --enable-integer-datetimes \

2
9.6/alpine/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

2
9.6/docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \

3
Dockerfile-alpine.template
View File

@ -46,6 +46,7 @@ RUN set -ex \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
bison \ bison \
coreutils \ coreutils \
dpkg-dev dpkg \
flex \ flex \
gcc \ gcc \
# krb5-dev \ # krb5-dev \
@ -71,9 +72,11 @@ RUN set -ex \
&& awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \ && awk '$1 == "#define" && $2 == "DEFAULT_PGSOCKET_DIR" && $3 == "\"/tmp\"" { $3 = "\"/var/run/postgresql\""; print; next } { print }' src/include/pg_config_manual.h > src/include/pg_config_manual.h.new \
&& grep '/var/run/postgresql' src/include/pg_config_manual.h.new \ && grep '/var/run/postgresql' src/include/pg_config_manual.h.new \
&& mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \ && mv src/include/pg_config_manual.h.new src/include/pg_config_manual.h \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
# configure options taken from: # configure options taken from:
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
&& ./configure \ && ./configure \
--build="$gnuArch" \
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
# --enable-nls \ # --enable-nls \
--enable-integer-datetimes \ --enable-integer-datetimes \

2
docker-entrypoint.sh
View File

@ -91,7 +91,7 @@ if [ "$1" = 'postgres' ]; then
echo "host all all all $authMethod" echo "host all all all $authMethod"
} >> "$PGDATA/pg_hba.conf" } >> "$PGDATA/pg_hba.conf"
# internal start of server in order to allow set-up using psql-client # internal start of server in order to allow set-up using psql-client
# does not listen on external TCP/IP and waits until start finishes # does not listen on external TCP/IP and waits until start finishes
PGUSER="${PGUSER:-postgres}" \ PGUSER="${PGUSER:-postgres}" \
pg_ctl -D "$PGDATA" \ pg_ctl -D "$PGDATA" \