IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use PG17 as the default in the container. #8022

Browse Source
This commit is contained in:
Akshay Joshi
2024-10-10 15:55:43 +05:30
parent 7a7782a350
commit 17883fbd84
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@@ -125,6 +125,7 @@ FROM postgres:13-alpine AS pg13-builder
FROM postgres:14-alpine AS pg14-builder
FROM postgres:15-alpine AS pg15-builder
FROM postgres:16-alpine AS pg16-builder
FROM postgres:17-alpine AS pg17-builder
FROM alpine:latest AS tool-builder
@@ -154,6 +155,11 @@ COPY --from=pg16-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-16/
COPY --from=pg16-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-16/
COPY --from=pg16-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-16/
COPY --from=pg17-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-17/
COPY --from=pg17-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-17/
COPY --from=pg17-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-17/
COPY --from=pg17-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-17/
#########################################################################
# Assemble everything into the final container.
#########################################################################
@@ -165,12 +171,12 @@ COPY --from=env-builder /venv /venv
# Copy in the tools
COPY --from=tool-builder /usr/local/pgsql /usr/local/
COPY --from=pg16-builder /usr/local/lib/libpq.so.5.16 /usr/lib/
COPY --from=pg16-builder /usr/lib/libzstd.so.1.5.6 /usr/lib/
COPY --from=pg16-builder /usr/lib/liblz4.so.1.9.4 /usr/lib/
COPY --from=pg17-builder /usr/local/lib/libpq.so.5.17 /usr/lib/
COPY --from=pg17-builder /usr/lib/libzstd.so.1.5.6 /usr/lib/
COPY --from=pg17-builder /usr/lib/liblz4.so.1.9.4 /usr/lib/
RUN ln -s libpq.so.5.16 /usr/lib/libpq.so.5 && \
ln -s libpq.so.5.16 /usr/lib/libpq.so && \
RUN ln -s libpq.so.5.17 /usr/lib/libpq.so.5 && \
ln -s libpq.so.5.17 /usr/lib/libpq.so && \
ln -s libzstd.so.1.5.6 /usr/lib/libzstd.so.1 && \
ln -s liblz4.so.1.9.4 /usr/lib/liblz4.so.1

7
docs/en_US/release_notes_8_13.rst
View File

@@ -14,7 +14,7 @@ Supported Database Servers
Bundled PostgreSQL Utilities
****************************
**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 16.4
**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 17.0
New features
@@ -42,4 +42,7 @@ Bug fixes
| `Issue #7957 <https://github.com/pgadmin-org/pgadmin4/issues/7957>`_ - Fixed an issue where cursor selection is not visible in the PSQL tool.
| `Issue #7965 <https://github.com/pgadmin-org/pgadmin4/issues/7965>`_ - Allow OAuth2 params OAUTH2_NAME, OAUTH2_DISPLAY_NAME, OAUTH2_ICON, OAUTH2_BUTTON_COLOR to be optional.
| `Issue #7988 <https://github.com/pgadmin-org/pgadmin4/issues/7988>`_ - Add appropriate minimum width and height setting for desktop apps to avoid app accidentally going below visibility levels.
| `Issue #7993 <https://github.com/pgadmin-org/pgadmin4/issues/7993>`_ - Fixed an issue where graphical explain keeps the node details open even after plan changed.
| `Issue #7993 <https://github.com/pgadmin-org/pgadmin4/issues/7993>`_ - Fixed an issue where graphical explain keeps the node details open even after plan changed.
| `Issue #8007 <https://github.com/pgadmin-org/pgadmin4/issues/8007>`_ - Fixed an issue in the debugger where function arguments of the character data type were being truncated.
| `Issue #8013 <https://github.com/pgadmin-org/pgadmin4/issues/8013>`_ - Fix the issue where rows do not retain shading when scrolling.
| `Issue #8022 <https://github.com/pgadmin-org/pgadmin4/issues/8022>`_ - Use PG17 as the default in the container.

3
pkg/docker/entrypoint.sh
View File

@@ -46,7 +46,8 @@ CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
LOG_FILE = '/dev/null'
HELP_PATH = '../../docs'
DEFAULT_BINARY_PATHS = {
'pg': '/usr/local/pgsql-16',
'pg': '/usr/local/pgsql-17',
'pg-17': '/usr/local/pgsql-17',
'pg-16': '/usr/local/pgsql-16',
'pg-15': '/usr/local/pgsql-15',
'pg-14': '/usr/local/pgsql-14',