Skip to content

Commit bec8234

Browse files
committed
Include additional tools in builds
1 parent 416a6b6 commit bec8234

File tree

5 files changed

+33
-9
lines changed

5 files changed

+33
-9
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ hs_err_pid*
2626

2727
# Gradle wrapper files
2828
!gradle/wrapper/
29-
!gradle/wrapper/gradle-wrapper.jar
29+
!gradle/wrapper/gradle-wrapper.jar
30+
31+
# Release archives
32+
release/

scripts/build-postgres-alpine.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,9 @@ $DOCKER_OPTS $IMG_NAME /bin/sh -ex -c 'echo "Starting building postgres binaries
157157
lib \
158158
bin/initdb \
159159
bin/pg_ctl \
160-
bin/postgres'
160+
bin/postgres \
161+
bin/pg_dump \
162+
bin/pg_dumpall \
163+
bin/pg_restore \
164+
bin/psql'
165+

scripts/build-postgres-debian.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ docker run -i --rm -v ${TRG_DIR}:/usr/local/pg-dist \
4040
-e GEOS_VERSION=3.7.2 \
4141
-e GDAL_VERSION=2.4.1 \
4242
$DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binaries" \
43-
&& sed "[email protected]@cz.archive.ubuntu.com@" -i /etc/apt/sources.list \
43+
&& sed "[email protected]@us.archive.ubuntu.com@" -i /etc/apt/sources.list \
4444
&& apt-get update && apt-get install -y --no-install-recommends \
4545
ca-certificates \
4646
wget \
@@ -154,4 +154,8 @@ $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting building postgres binari
154154
lib \
155155
bin/initdb \
156156
bin/pg_ctl \
157-
bin/postgres'
157+
bin/postgres \
158+
bin/pg_dump \
159+
bin/pg_dumpall \
160+
bin/pg_restore \
161+
bin/psql'

scripts/repack-postgres.sh

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ if [ "$PLATFORM_NAME" = "darwin" ] ; then
101101
$([ -f lib/postgresql/llvmjit_types.bc ] && echo lib/postgresql/*.so lib/postgresql/*.bc || echo lib/postgresql/*.so) \
102102
bin/initdb \
103103
bin/pg_ctl \
104-
bin/postgres
104+
bin/postgres \
105+
bin/pg_dump \
106+
bin/pg_dumpall \
107+
bin/pg_restore \
108+
bin/psql
105109

106110
elif [ "$PLATFORM_NAME" = "windows" ] ; then
107111

@@ -114,6 +118,10 @@ elif [ "$PLATFORM_NAME" = "windows" ] ; then
114118
bin/initdb.exe \
115119
bin/pg_ctl.exe \
116120
bin/postgres.exe \
121+
bin/pg_dump.exe \
122+
bin/pg_dumpall.exe \
123+
bin/pg_restore.exe \
124+
bin/psql.exe \
117125
bin/*.dll
118126

119127
elif [ "$PLATFORM_NAME" = "linux" ] ; then
@@ -123,6 +131,10 @@ elif [ "$PLATFORM_NAME" = "linux" ] ; then
123131
lib \
124132
bin/initdb \
125133
bin/pg_ctl \
126-
bin/postgres
134+
bin/postgres \
135+
bin/pg_dump \
136+
bin/pg_dumpall \
137+
bin/pg_restore \
138+
bin/psql
127139

128-
fi
140+
fi

scripts/test-postgres-linux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ docker run -i --rm -v ${LIB_DIR}:/usr/local/pg-lib:ro \
3737
-e PG_VERSION=$PG_VERSION \
3838
-e POSTGIS_VERSION=$POSTGIS_VERSION \
3939
$DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting testing postgres binaries" \
40-
&& sed "[email protected]@cz.archive.ubuntu.com@" -i /etc/apt/sources.list \
40+
&& sed "[email protected]@us.archive.ubuntu.com@" -i /etc/apt/sources.list \
4141
&& apt-get update && apt-get install -y --no-install-recommends \
4242
postgresql-client \
4343
xz-utils \
@@ -62,4 +62,4 @@ $DOCKER_OPTS $IMG_NAME /bin/bash -ex -c 'echo "Starting testing postgres binarie
6262
\
6363
&& if echo "$PG_VERSION" | grep -qvE '\''^(10|9)\.'\'' ; then test $(psql -qAtX -h localhost -p 65432 -U postgres -d postgres -c '\''SET jit_above_cost = 10; SELECT SUM(relpages) FROM pg_class;'\'') -gt 0 ; fi \
6464
\
65-
&& if [ -n "$POSTGIS_VERSION" ]; then test $(psql -qAtX -h localhost -p 65432 -U postgres -d postgres -c "CREATE EXTENSION postgis; SELECT PostGIS_Lib_Version();") = $POSTGIS_VERSION ; fi'
65+
&& if [ -n "$POSTGIS_VERSION" ]; then test $(psql -qAtX -h localhost -p 65432 -U postgres -d postgres -c "CREATE EXTENSION postgis; SELECT PostGIS_Lib_Version();") = $POSTGIS_VERSION ; fi'

0 commit comments

Comments
 (0)