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

Updated PostgreSQL version from 13 to 14, to get the latest utility files.

Browse Source
This commit is contained in:
Akshay Joshi 2021-10-04 16:12:45 +05:30
parent e77f933fe7
commit 7d5668141d
6 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Dockerfile
View File

@ -12,7 +12,7 @@
# and clean up the web/ source code # and clean up the web/ source code
######################################################################### #########################################################################
FROM alpine:3.13 AS app-builder FROM alpine:3.14 AS app-builder
RUN apk add --no-cache \ RUN apk add --no-cache \
autoconf \ autoconf \
@ -60,7 +60,7 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
# Next, create the base environment for Python # Next, create the base environment for Python
######################################################################### #########################################################################
FROM alpine:3.13 as env-builder FROM alpine:3.14 as env-builder
# Install dependencies # Install dependencies
COPY requirements.txt / COPY requirements.txt /
@ -113,8 +113,9 @@ FROM postgres:10-alpine as pg10-builder
FROM postgres:11-alpine as pg11-builder FROM postgres:11-alpine as pg11-builder
FROM postgres:12-alpine as pg12-builder FROM postgres:12-alpine as pg12-builder
FROM postgres:13-alpine as pg13-builder FROM postgres:13-alpine as pg13-builder
FROM postgres:14-alpine as pg14-builder
FROM alpine:3.13 as tool-builder FROM alpine:3.14 as tool-builder
# Copy the PG binaries # Copy the PG binaries
COPY --from=pg96-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.6/ COPY --from=pg96-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.6/
@ -142,11 +143,15 @@ COPY --from=pg13-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-13/
COPY --from=pg13-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-13/ COPY --from=pg13-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-13/
COPY --from=pg13-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-13/ COPY --from=pg13-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-13/
COPY --from=pg14-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-14/
COPY --from=pg14-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-14/
COPY --from=pg14-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-14/
COPY --from=pg14-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-14/
######################################################################### #########################################################################
# Assemble everything into the final container. # Assemble everything into the final container.
######################################################################### #########################################################################
FROM alpine:3.13 FROM alpine:3.14
# Copy in the Python packages # Copy in the Python packages
COPY --from=env-builder /venv /venv COPY --from=env-builder /venv /venv

12
docs/en_US/container_deployment.rst
View File

@ -22,17 +22,19 @@ server:
* PostgreSQL 11: */usr/local/pgsql-11* * PostgreSQL 11: */usr/local/pgsql-11*
* PostgreSQL 12: */usr/local/pgsql-12* * PostgreSQL 12: */usr/local/pgsql-12*
* PostgreSQL 13: */usr/local/pgsql-13* * PostgreSQL 13: */usr/local/pgsql-13*
* PostgreSQL 14: */usr/local/pgsql-14*
The default binary paths set in the container are as follows: The default binary paths set in the container are as follows:
.. code-block:: bash .. code-block:: bash
DEFAULT_BINARY_PATHS = { DEFAULT_BINARY_PATHS = {
'pg-13': '/usr/local/pgsql-13' 'pg-14': '/usr/local/pgsql-14',
'pg-12': '/usr/local/pgsql-12' 'pg-13': '/usr/local/pgsql-13',
'pg-11': '/usr/local/pgsql-11' 'pg-12': '/usr/local/pgsql-12',
'pg-10': '/usr/local/pgsql-10' 'pg-11': '/usr/local/pgsql-11',
'pg-9.6': '/usr/local/pgsql-9.6' 'pg-10': '/usr/local/pgsql-10',
'pg-9.6': '/usr/local/pgsql-9.6'
} }
this may be changed in the :ref:`preferences`. this may be changed in the :ref:`preferences`.

2
pkg/debian/build.sh
View File

@ -35,7 +35,7 @@ Package: ${APP_NAME}-server
Version: ${APP_LONG_VERSION} Version: ${APP_LONG_VERSION}
Architecture: ${OS_ARCH} Architecture: ${OS_ARCH}
Depends: python3, libpq5 (>= 11.0), libgssapi-krb5-2 Depends: python3, libpq5 (>= 11.0), libgssapi-krb5-2
Recommends: postgresql-client | postgresql-client-13 | postgresql-client-12 | postgresql-client-11 | postgresql-client-10 Recommends: postgresql-client | postgresql-client-14 | postgresql-client-13 | postgresql-client-12 | postgresql-client-11 | postgresql-client-10
Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org> Maintainer: pgAdmin Development Team <pgadmin-hackers@postgresql.org>
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. 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.
EOF EOF

3
pkg/docker/entrypoint.sh
View File

@ -10,7 +10,8 @@ CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
LOG_FILE = '/dev/null' LOG_FILE = '/dev/null'
HELP_PATH = '../../docs' HELP_PATH = '../../docs'
DEFAULT_BINARY_PATHS = { DEFAULT_BINARY_PATHS = {
'pg': '/usr/local/pgsql-13', 'pg': '/usr/local/pgsql-14',
'pg-14': '/usr/local/pgsql-14',
'pg-13': '/usr/local/pgsql-13', 'pg-13': '/usr/local/pgsql-13',
'pg-12': '/usr/local/pgsql-12', 'pg-12': '/usr/local/pgsql-12',
'pg-11': '/usr/local/pgsql-11', 'pg-11': '/usr/local/pgsql-11',

4
pkg/redhat/build.sh
View File

@ -11,7 +11,7 @@ OS_NAME=$(cat /etc/os-release | grep "^ID=" | awk -F "=" '{ print $2 }' | sed 's
OS_ARCH=$(arch) OS_ARCH=$(arch)
# Make sure we get the right libpq # Make sure we get the right libpq
export PATH=/usr/pgsql-12/bin:$PATH export PATH=/usr/pgsql-14/bin:$PATH
# Common Linux build functions # Common Linux build functions
source pkg/linux/build-functions.sh source pkg/linux/build-functions.sh
@ -216,7 +216,7 @@ if [ ${OS_VERSION} == 7 ]; then
fi fi
# Get the libpq we need # Get the libpq we need
yumdownloader -y --downloadonly --destdir=$DISTROOT postgresql13-libs yumdownloader -y --downloadonly --destdir=$DISTROOT postgresql14-libs
# #
# Get the results! # Get the results!

4
pkg/redhat/setup.sh
View File

@ -35,10 +35,10 @@ echo "Installing build pre-requisites..."
yum groupinstall -y "Development Tools" yum groupinstall -y "Development Tools"
if [ ${OS_VERSION} == 7 ]; then if [ ${OS_VERSION} == 7 ]; then
yum install -y expect fakeroot httpd-devel postgresql12-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel yum install -y expect fakeroot httpd-devel postgresql14-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
pip3 install sphinx pip3 install sphinx
else else
yum install -y expect fakeroot postgresql12-devel python3-devel python3-sphinx nodejs yarn rpm-build rpm-sign yum-utils krb5-devel yum install -y expect fakeroot postgresql14-devel python3-devel python3-sphinx nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
fi fi
# Setup RPM macros for signing # Setup RPM macros for signing