Skip to content

Commit 8ef3f23

Browse files
committed
Support PostgreSQL 15.
1 parent 3d0078c commit 8ef3f23

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ FROM postgres:11-alpine as pg11-builder
116116
FROM postgres:12-alpine as pg12-builder
117117
FROM postgres:13-alpine as pg13-builder
118118
FROM postgres:14-alpine as pg14-builder
119+
FROM postgres:15-alpine as pg15-builder
119120

120121
FROM alpine:3.16 as tool-builder
121122

@@ -145,6 +146,11 @@ COPY --from=pg14-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-14/
145146
COPY --from=pg14-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-14/
146147
COPY --from=pg14-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-14/
147148

149+
COPY --from=pg15-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-15/
150+
COPY --from=pg15-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-15/
151+
COPY --from=pg15-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-15/
152+
COPY --from=pg15-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-15/
153+
148154
#########################################################################
149155
# Assemble everything into the final container.
150156
#########################################################################
@@ -156,9 +162,9 @@ COPY --from=env-builder /venv /venv
156162

157163
# Copy in the tools
158164
COPY --from=tool-builder /usr/local/pgsql /usr/local/
159-
COPY --from=pg14-builder /usr/local/lib/libpq.so.5.14 /usr/lib/
160-
RUN ln -s libpq.so.5.14 /usr/lib/libpq.so.5 && \
161-
ln -s libpq.so.5.14 /usr/lib/libpq.so
165+
COPY --from=pg15-builder /usr/local/lib/libpq.so.5.15 /usr/lib/
166+
RUN ln -s libpq.so.5.15 /usr/lib/libpq.so.5 && \
167+
ln -s libpq.so.5.15 /usr/lib/libpq.so
162168

163169
WORKDIR /pgadmin4
164170
ENV PYTHONPATH=/pgadmin4

pkg/debian/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Architecture: ${OS_ARCH}
3939
Section: database
4040
Priority: optional
4141
Depends: python3, libpq5 (>= 11.0), libgssapi-krb5-2
42-
Recommends: postgresql-client | postgresql-client-14 | postgresql-client-13 | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
42+
Recommends: postgresql-client | postgresql-client-15 | postgresql-client-14 | postgresql-client-13 | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
4343
Maintainer: pgAdmin Development Team <[email protected]>
4444
Description: The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
4545
EOF

pkg/docker/entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
1919
LOG_FILE = '/dev/null'
2020
HELP_PATH = '../../docs'
2121
DEFAULT_BINARY_PATHS = {
22-
'pg': '/usr/local/pgsql-14',
22+
'pg': '/usr/local/pgsql-15',
23+
'pg-15': '/usr/local/pgsql-15',
2324
'pg-14': '/usr/local/pgsql-14',
2425
'pg-13': '/usr/local/pgsql-13',
2526
'pg-12': '/usr/local/pgsql-12',

0 commit comments

Comments
 (0)