1
0
mirror of https://github.com/docker-library/postgres.git synced 2025-11-19 00:22:57 +03:00

Merge pull request #284 from infosiftr/multiarch

Add explicit "--build" to our "./configure" invocations
This commit is contained in:
yosifkit
2017-05-10 12:05:46 -07:00
committed by GitHub
18 changed files with 62 additions and 11 deletions

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 \
@@ -79,7 +80,12 @@ RUN set -ex \
&& rm uuid.tar.gz \ && rm uuid.tar.gz \
&& ( \ && ( \
cd /usr/src/ossp-uuid \ cd /usr/src/ossp-uuid \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
&& wget -O config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
&& wget -O config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
&& ./configure \ && ./configure \
--build="$gnuArch" \
--prefix=/usr/local \ --prefix=/usr/local \
&& make -j "$(nproc)" \ && make -j "$(nproc)" \
&& make install \ && make install \
@@ -92,9 +98,14 @@ 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)" \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
# 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 \

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" \

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" \

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 \
@@ -79,7 +80,12 @@ RUN set -ex \
&& rm uuid.tar.gz \ && rm uuid.tar.gz \
&& ( \ && ( \
cd /usr/src/ossp-uuid \ cd /usr/src/ossp-uuid \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
&& wget -O config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
&& wget -O config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
&& ./configure \ && ./configure \
--build="$gnuArch" \
--prefix=/usr/local \ --prefix=/usr/local \
&& make -j "$(nproc)" \ && make -j "$(nproc)" \
&& make install \ && make install \
@@ -92,9 +98,14 @@ 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)" \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
# 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 \

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" \

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" \

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,14 @@ 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)" \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
# 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 \

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" \

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" \

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,14 @@ 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)" \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
# 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 \

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" \

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" \

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,14 @@ 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)" \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
# 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 \

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" \

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" \

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,14 @@ 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)" \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
&& wget -O config/config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
&& wget -O config/config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
# 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 \

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" \

View File

@@ -11,7 +11,12 @@
&& rm uuid.tar.gz \ && rm uuid.tar.gz \
&& ( \ && ( \
cd /usr/src/ossp-uuid \ cd /usr/src/ossp-uuid \
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
# explicitly update autoconf config.guess and config.sub so they support more arches/libcs
&& wget -O config.guess "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" \
&& wget -O config.sub "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" \
&& ./configure \ && ./configure \
--build="$gnuArch" \
--prefix=/usr/local \ --prefix=/usr/local \
&& make -j "$(nproc)" \ && make -j "$(nproc)" \
&& make install \ && make install \