Skip to content

Commit 70b3554

Browse files
author
Joshua Lockerman
committed
Dockerfiles with EXEC_BACKEND enabled
Update the dockerfiles we use with EXEC_BACKEND and debug enabled so we can test windows behavior.
1 parent 2337858 commit 70b3554

File tree

8 files changed

+31
-50
lines changed

8 files changed

+31
-50
lines changed

‎10/alpine/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ RUN set -ex \
8080
&& wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \
8181
# configure options taken from:
8282
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
83-
&& ./configure \
83+
&& CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \
8484
--build="$gnuArch" \
8585
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
8686
# --enable-nls \
8787
--enable-integer-datetimes \
8888
--enable-thread-safety \
8989
--enable-tap-tests \
90-
# skip debugging info -- we want tiny size instead
91-
# --enable-debug \
90+
# unlike the official version, enable debug info, we're only using this for CI
91+
--enable-debug \
9292
--disable-rpath \
9393
--with-uuid=e2fs \
9494
--with-gnu-ld \

‎11/alpine/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ RUN set -ex \
8080
&& wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \
8181
# configure options taken from:
8282
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
83-
&& ./configure \
83+
&& CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \
8484
--build="$gnuArch" \
8585
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
8686
# --enable-nls \
8787
--enable-integer-datetimes \
8888
--enable-thread-safety \
8989
--enable-tap-tests \
90-
# skip debugging info -- we want tiny size instead
91-
# --enable-debug \
90+
# unlike the official version, enable debug info, we're only using this for CI
91+
--enable-debug \
9292
--disable-rpath \
9393
--with-uuid=e2fs \
9494
--with-gnu-ld \
@@ -110,6 +110,7 @@ RUN set -ex \
110110
--with-libxml \
111111
--with-libxslt \
112112
--with-icu \
113+
# we enable EXEC_BACKEND to test windows behavior
113114
&& make -j "$(nproc)" world \
114115
&& make install-world \
115116
&& make -C contrib install \

‎9.3/alpine/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ RUN set -ex \
107107
&& wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \
108108
# configure options taken from:
109109
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
110-
&& ./configure \
110+
&& CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \
111111
--build="$gnuArch" \
112112
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
113113
# --enable-nls \
114114
--enable-integer-datetimes \
115115
--enable-thread-safety \
116-
# skip debugging info -- we want tiny size instead
117-
# --enable-debug \
116+
# unlike the official version, enable debug info, we're only using this for CI
117+
--enable-debug \
118118
--disable-rpath \
119119
--with-ossp-uuid \
120120
--with-gnu-ld \
@@ -135,6 +135,7 @@ RUN set -ex \
135135
--with-openssl \
136136
--with-libxml \
137137
--with-libxslt \
138+
# we enable EXEC_BACKEND to test windows behavior
138139
&& make -j "$(nproc)" world \
139140
&& make install-world \
140141
&& make -C contrib install \

‎9.4/alpine/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ RUN set -ex \
7979
&& wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \
8080
# configure options taken from:
8181
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
82-
&& ./configure \
82+
&& CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \
8383
--build="$gnuArch" \
8484
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
8585
# --enable-nls \
8686
--enable-integer-datetimes \
8787
--enable-thread-safety \
8888
--enable-tap-tests \
89-
# skip debugging info -- we want tiny size instead
90-
# --enable-debug \
89+
# unlike the official version, enable debug info, we're only using this for CI
90+
--enable-debug \
9191
--disable-rpath \
9292
--with-uuid=e2fs \
9393
--with-gnu-ld \
@@ -108,6 +108,7 @@ RUN set -ex \
108108
--with-openssl \
109109
--with-libxml \
110110
--with-libxslt \
111+
# we enable EXEC_BACKEND to test windows behavior
111112
&& make -j "$(nproc)" world \
112113
&& make install-world \
113114
&& make -C contrib install \

‎9.5/alpine/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ RUN set -ex \
7979
&& wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \
8080
# configure options taken from:
8181
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
82-
&& ./configure \
82+
&& CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \
8383
--build="$gnuArch" \
8484
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
8585
# --enable-nls \
8686
--enable-integer-datetimes \
8787
--enable-thread-safety \
8888
--enable-tap-tests \
89-
# skip debugging info -- we want tiny size instead
90-
# --enable-debug \
89+
# unlike the official version, enable debug info, we're only using this for CI
90+
--enable-debug \
9191
--disable-rpath \
9292
--with-uuid=e2fs \
9393
--with-gnu-ld \
@@ -108,6 +108,7 @@ RUN set -ex \
108108
--with-openssl \
109109
--with-libxml \
110110
--with-libxslt \
111+
# we enable EXEC_BACKEND to test windows behavior
111112
&& make -j "$(nproc)" world \
112113
&& make install-world \
113114
&& make -C contrib install \

‎9.6/alpine/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ RUN set -ex \
7979
&& wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb' \
8080
# configure options taken from:
8181
# https://anonscm.debian.org/cgit/pkg-postgresql/postgresql.git/tree/debian/rules?h=9.5
82-
&& ./configure \
82+
&& CPPFLAGS="-DEXEC_BACKEND=1 $CPPFLAGS" ./configure \
8383
--build="$gnuArch" \
8484
# "/usr/src/postgresql/src/backend/access/common/tupconvert.c:105: undefined reference to `libintl_gettext'"
8585
# --enable-nls \
8686
--enable-integer-datetimes \
8787
--enable-thread-safety \
8888
--enable-tap-tests \
89-
# skip debugging info -- we want tiny size instead
90-
# --enable-debug \
89+
# unlike the official version, enable debug info, we're only using this for CI
90+
--enable-debug \
9191
--disable-rpath \
9292
--with-uuid=e2fs \
9393
--with-gnu-ld \
@@ -108,6 +108,7 @@ RUN set -ex \
108108
--with-openssl \
109109
--with-libxml \
110110
--with-libxslt \
111+
# we enable EXEC_BACKEND to test windows behavior
111112
&& make -j "$(nproc)" world \
112113
&& make install-world \
113114
&& make -C contrib install \

‎Dockerfile-alpine.template

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ RUN set -ex \
8989
--enable-integer-datetimes \
9090
--enable-thread-safety \
9191
--enable-tap-tests \
92-
# skip debugging info -- we want tiny size instead
93-
# --enable-debug \
92+
# unlike the official version, enable debug info, we're only using this for CI
93+
--enable-debug \
9494
--disable-rpath \
9595
%%UUID_CONFIG_FLAG%% \
9696
--with-gnu-ld \
@@ -112,9 +112,10 @@ RUN set -ex \
112112
--with-libxml \
113113
--with-libxslt \
114114
--with-icu \
115-
&& make -j "$(nproc)" world \
116-
&& make install-world \
117-
&& make -C contrib install \
115+
# we enable EXEC_BACKEND to test windows behavior
116+
&& make -DEXEC_BACKEND=1 -j "$(nproc)" world \
117+
&& make -DEXEC_BACKEND=1 install-world \
118+
&& make -DEXEC_BACKEND=1 -C contrib install \
118119
\
119120
&& runDeps="$( \
120121
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \

‎README.md

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,2 @@
1-
# https://github.com/docker-library/postgres
2-
3-
## Maintained by: [the PostgreSQL Docker Community](https://github.com/docker-library/postgres)
4-
5-
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.
6-
7-
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).
8-
9-
## See a change merged here that doesn't show up on Docker Hub yet?
10-
11-
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).
12-
13-
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).
14-
15-
---
16-
17-
- [Travis CI:
18-
![build status badge](https://img.shields.io/travis/docker-library/postgres/master.svg)](https://travis-ci.org/docker-library/postgres/branches)
19-
- [Automated `update.sh`:
20-
![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)
21-
22-
| Build | Status | Badges | (per-arch) |
23-
|:-:|:-:|:-:|:-:|
24-
| [`amd64`<br />![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`<br />![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`<br />![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`<br />![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) |
25-
| [`arm64v8`<br />![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`<br />![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`<br />![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`<br />![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) |
26-
27-
<!-- THIS FILE IS GENERATED BY https://github.com/docker-library/docs/blob/master/generate-repo-stub-readme.sh -->
1+
Fork of [the official docker-library postgres repo](https://github.com/docker-library/postgres)
2+
with Dockerfiles updated to include EXEC_BACKEND to emulate windows for CI purposes.

0 commit comments

Comments
 (0)