diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index b785cc85da..95617223a3 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -80,15 +80,15 @@ RUN set -ex \ && wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 - && ./configure \ + && CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ --enable-thread-safety \ --enable-tap-tests \ -# skip debugging info -- we want tiny size instead -# --enable-debug \ +# unlike the official version, enable debug info, we're only using this for CI + --enable-debug \ --disable-rpath \ --with-uuid=e2fs \ --with-gnu-ld \ diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index feb9e4c382..3415c53a87 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -80,15 +80,15 @@ RUN set -ex \ && wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 - && ./configure \ + && CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ --enable-thread-safety \ --enable-tap-tests \ -# skip debugging info -- we want tiny size instead -# --enable-debug \ +# unlike the official version, enable debug info, we're only using this for CI + --enable-debug \ --disable-rpath \ --with-uuid=e2fs \ --with-gnu-ld \ @@ -110,6 +110,7 @@ RUN set -ex \ --with-libxml \ --with-libxslt \ --with-icu \ +# we enable EXEC_BACKEND to test windows behavior && make -j "$(nproc)" world \ && make install-world \ && make -C contrib install \ diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile index 048523c0c8..b7a143a949 100644 --- a/9.3/alpine/Dockerfile +++ b/9.3/alpine/Dockerfile @@ -107,14 +107,14 @@ RUN set -ex \ && wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 - && ./configure \ + && CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ --enable-thread-safety \ -# skip debugging info -- we want tiny size instead -# --enable-debug \ +# unlike the official version, enable debug info, we're only using this for CI + --enable-debug \ --disable-rpath \ --with-ossp-uuid \ --with-gnu-ld \ @@ -135,6 +135,7 @@ RUN set -ex \ --with-openssl \ --with-libxml \ --with-libxslt \ +# we enable EXEC_BACKEND to test windows behavior && make -j "$(nproc)" world \ && make install-world \ && make -C contrib install \ diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile index 9bd6e54643..abb5aca0f6 100644 --- a/9.4/alpine/Dockerfile +++ b/9.4/alpine/Dockerfile @@ -79,15 +79,15 @@ RUN set -ex \ && wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 - && ./configure \ + && CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ --enable-thread-safety \ --enable-tap-tests \ -# skip debugging info -- we want tiny size instead -# --enable-debug \ +# unlike the official version, enable debug info, we're only using this for CI + --enable-debug \ --disable-rpath \ --with-uuid=e2fs \ --with-gnu-ld \ @@ -108,6 +108,7 @@ RUN set -ex \ --with-openssl \ --with-libxml \ --with-libxslt \ +# we enable EXEC_BACKEND to test windows behavior && make -j "$(nproc)" world \ && make install-world \ && make -C contrib install \ diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile index c3493f2766..e10341a9f0 100644 --- a/9.5/alpine/Dockerfile +++ b/9.5/alpine/Dockerfile @@ -79,15 +79,15 @@ RUN set -ex \ && wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 - && ./configure \ + && CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ --enable-thread-safety \ --enable-tap-tests \ -# skip debugging info -- we want tiny size instead -# --enable-debug \ +# unlike the official version, enable debug info, we're only using this for CI + --enable-debug \ --disable-rpath \ --with-uuid=e2fs \ --with-gnu-ld \ @@ -108,6 +108,7 @@ RUN set -ex \ --with-openssl \ --with-libxml \ --with-libxslt \ +# we enable EXEC_BACKEND to test windows behavior && make -j "$(nproc)" world \ && make install-world \ && make -C contrib install \ diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile index b6442ce8eb..0d9bf34647 100644 --- a/9.6/alpine/Dockerfile +++ b/9.6/alpine/Dockerfile @@ -79,15 +79,15 @@ RUN set -ex \ && wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \ # configure options taken from: # https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5 - && ./configure \ + && CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \ --build="$gnuArch" \ # "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'" # --enable-nls \ --enable-integer-datetimes \ --enable-thread-safety \ --enable-tap-tests \ -# skip debugging info -- we want tiny size instead -# --enable-debug \ +# unlike the official version, enable debug info, we're only using this for CI + --enable-debug \ --disable-rpath \ --with-uuid=e2fs \ --with-gnu-ld \ @@ -108,6 +108,7 @@ RUN set -ex \ --with-openssl \ --with-libxml \ --with-libxslt \ +# we enable EXEC_BACKEND to test windows behavior && make -j "$(nproc)" world \ && make install-world \ && make -C contrib install \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 170316abc6..d28919d677 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -89,8 +89,8 @@ RUN set -ex \ --enable-integer-datetimes \ --enable-thread-safety \ --enable-tap-tests \ -# skip debugging info -- we want tiny size instead -# --enable-debug \ +# unlike the official version, enable debug info, we're only using this for CI + --enable-debug \ --disable-rpath \ %%UUID_CONFIG_FLAG%% \ --with-gnu-ld \ @@ -112,9 +112,10 @@ RUN set -ex \ --with-libxml \ --with-libxslt \ --with-icu \ - && make -j "$(nproc)" world \ - && make install-world \ - && make -C contrib install \ +# we enable EXEC_BACKEND to test windows behavior + && make -DEXEC_BACKEND=1 -j "$(nproc)" world \ + && make -DEXEC_BACKEND=1 install-world \ + && make -DEXEC_BACKEND=1 -C contrib install \ \ && runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ diff --git a/README.md b/README.md index 99f531d5bc..cfdfa403af 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,2 @@ -# https://github.com/docker-library/postgres - -## Maintained by: [the PostgreSQL Docker Community](https://github.com/docker-library/postgres) - -This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/docker-hub/official_repos/) for [postgres](https://hub.docker.com/_/postgres/) (not to be confused with any official postgres image provided by postgres upstream). See [the Docker Hub page](https://hub.docker.com/_/postgres/) for the full readme on how to use this Docker image and for information regarding contributing and issues. - -The [full description from Docker Hub](https://hub.docker.com/_/postgres/) is generated over in [docker-library/docs](https://github.com/docker-library/docs), specifically in [docker-library/docs/postgres](https://github.com/docker-library/docs/tree/master/postgres). - -## See a change merged here that doesn't show up on Docker Hub yet? - -Check [the "library/postgres" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/postgres), especially [PRs with the "library/postgres" label on that repo](https://github.com/docker-library/official-images/labels/library%2Fpostgres). - -For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md). - ---- - -- [Travis CI: - ![build status badge](https://img.shields.io/travis/docker-library/postgres/master.svg)](https://travis-ci.org/docker-library/postgres/branches) -- [Automated `update.sh`: - ![build status badge](https://doi-janky.infosiftr.net/job/update.sh/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/update.sh/job/postgres) - -| Build | Status | Badges | (per-arch) | -|:-:|:-:|:-:|:-:| -| [`amd64`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/postgres) | [`arm32v5`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/postgres) | [`arm32v6`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/postgres) | [`arm32v7`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/postgres) | -| [`arm64v8`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/postgres) | [`i386`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/postgres) | [`ppc64le`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/postgres) | [`s390x`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/postgres/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/postgres) | - - +Fork of [the official docker-library postgres repo](https://github.com/docker-library/postgres) +with Dockerfiles updated to include EXEC_BACKEND to emulate windows for CI purposes.