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

Update dependencies in the Docker container and remove PG 9.4 utilities from the Docker container as it's now out of support.

Browse Source 
Fixes #5552.
Fixes #5553.
This commit is contained in:
Dave Page 2020-05-22 17:02:02 +01:00
parent d42b712ee4
commit 83cb01b8cd
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@ -12,7 +12,7 @@
# and clean up the web/ source code # and clean up the web/ source code
######################################################################### #########################################################################
FROM node:10-alpine AS app-builder FROM node:12-alpine3.11 AS app-builder
RUN apk add --no-cache \ RUN apk add --no-cache \
autoconf \ autoconf \
@ -66,7 +66,7 @@ RUN npm install && \
# Now, create a documentation build container for the Sphinx docs # Now, create a documentation build container for the Sphinx docs
######################################################################### #########################################################################
FROM python:3.7-alpine3.10 as docs-builder FROM python:3.8-alpine3.11 as docs-builder
# Install only dependencies absolutely required for documentation building # Install only dependencies absolutely required for documentation building
RUN apk add --no-cache \ RUN apk add --no-cache \
@ -98,21 +98,15 @@ RUN LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 make -C /pgadmin4/docs/en_US -f Makefile
# Create additional builders to get all of the PostgreSQL utilities # Create additional builders to get all of the PostgreSQL utilities
######################################################################### #########################################################################
FROM postgres:9.4-alpine as pg94-builder
FROM postgres:9.5-alpine as pg95-builder FROM postgres:9.5-alpine as pg95-builder
FROM postgres:9.6-alpine as pg96-builder FROM postgres:9.6-alpine as pg96-builder
FROM postgres:10-alpine as pg10-builder 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 alpine:3.10 as tool-builder FROM alpine:3.11 as tool-builder
# Copy the PG binaries # Copy the PG binaries
COPY --from=pg94-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.4/
COPY --from=pg94-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.4/
COPY --from=pg94-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.4/
COPY --from=pg94-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-9.4/
COPY --from=pg95-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.5/ COPY --from=pg95-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.5/
COPY --from=pg95-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.5/ COPY --from=pg95-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.5/
COPY --from=pg95-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.5/ COPY --from=pg95-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.5/
@ -142,7 +136,7 @@ COPY --from=pg12-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-12/
# Assemble everything into the final container. # Assemble everything into the final container.
######################################################################### #########################################################################
FROM python:3.7-alpine3.10 FROM python:3.8-alpine3.11
COPY --from=tool-builder /usr/local/pgsql /usr/local/ COPY --from=tool-builder /usr/local/pgsql /usr/local/
@ -194,7 +188,7 @@ RUN groupadd -g 5050 pgadmin && \
chown pgadmin:pgadmin /var/log/pgadmin && \ chown pgadmin:pgadmin /var/log/pgadmin && \
touch /pgadmin4/config_distro.py && \ touch /pgadmin4/config_distro.py && \
chown pgadmin:pgadmin /pgadmin4/config_distro.py && \ chown pgadmin:pgadmin /pgadmin4/config_distro.py && \
setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/python3.7 setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/python3.8
USER pgadmin USER pgadmin
# Finish up # Finish up

1
docs/en_US/container_deployment.rst
View File

@ -17,7 +17,6 @@ maintenance functions to be executed. Multiple versions are included in the
following directories to allow use with different versions of the database following directories to allow use with different versions of the database
server: server:
* PostgreSQL 9.4: */usr/local/pgsql-9.4*
* PostgreSQL 9.5: */usr/local/pgsql-9.5* * PostgreSQL 9.5: */usr/local/pgsql-9.5*
* PostgreSQL 9.6: */usr/local/pgsql-9.6* * PostgreSQL 9.6: */usr/local/pgsql-9.6*
* PostgreSQL 10: */usr/local/pgsql-10* * PostgreSQL 10: */usr/local/pgsql-10*

2
docs/en_US/release_notes_4_22.rst
View File

@ -23,6 +23,8 @@ Housekeeping
| `Issue #5455 <https://redmine.postgresql.org/issues/5455>`_ - Refactor pgAdmin4.py so it can be imported and is a lot more readable. | `Issue #5455 <https://redmine.postgresql.org/issues/5455>`_ - Refactor pgAdmin4.py so it can be imported and is a lot more readable.
| `Issue #5493 <https://redmine.postgresql.org/issues/5493>`_ - Search object UI improvements. | `Issue #5493 <https://redmine.postgresql.org/issues/5493>`_ - Search object UI improvements.
| `Issue #5525 <https://redmine.postgresql.org/issues/5525>`_ - Cleanup and refactor the macOS build scripts. | `Issue #5525 <https://redmine.postgresql.org/issues/5525>`_ - Cleanup and refactor the macOS build scripts.
| `Issue #5552 <https://redmine.postgresql.org/issues/5552>`_ - Update dependencies in the Docker container.
| `Issue #5553 <https://redmine.postgresql.org/issues/5553>`_ - Remove PG 9.4 utilities from the Docker container as it's now out of support.
Bug fixes Bug fixes
********* *********