IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-07-07 04:53:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update the container base image to Alpine 3.16 (with Python 3.10.5). Fixes #7595

Browse Source
This commit is contained in:
Dave Page 2022-08-04 11:50:56 +01:00
parent 5877b49f64
commit 060d7ba46b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -12,7 +12,7 @@
# and clean up the web/ source code
#########################################################################
FROM alpine:3.15 AS app-builder
FROM alpine:3.16 AS app-builder
RUN apk add --no-cache \
autoconf \
@ -60,7 +60,7 @@ RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
# Next, create the base environment for Python
#########################################################################
FROM alpine:3.15 as env-builder
FROM alpine:3.16 as env-builder
# Install dependencies
COPY requirements.txt /
@ -117,7 +117,7 @@ FROM postgres:12-alpine as pg12-builder
FROM postgres:13-alpine as pg13-builder
FROM postgres:14-alpine as pg14-builder
FROM alpine:3.15 as tool-builder
FROM alpine:3.16 as tool-builder
# Copy the PG binaries
COPY --from=pg10-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-10/
@ -149,7 +149,7 @@ COPY --from=pg14-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-14/
# Assemble everything into the final container.
#########################################################################
FROM alpine:3.15
FROM alpine:3.16
# Copy in the Python packages
COPY --from=env-builder /venv /venv
@ -196,7 +196,7 @@ RUN apk add \
chown pgadmin:root /pgadmin4/config_distro.py && \
chmod g=u /pgadmin4/config_distro.py && \
chmod g=u /etc/passwd && \
setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.9 && \
setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.10 && \
echo "pgadmin ALL = NOPASSWD: /usr/sbin/postfix start" > /etc/sudoers.d/postfix && \
echo "pgadminr ALL = NOPASSWD: /usr/sbin/postfix start" >> /etc/sudoers.d/postfix

1
docs/en_US/release_notes_6_13.rst
View File

@ -15,6 +15,7 @@ Housekeeping
************
| `Issue #7567 <https://redmine.postgresql.org/issues/7567>`_ - Port About dialog to React.
| `Issue #7595 <https://redmine.postgresql.org/issues/7595>`_ - Update the container base image to Alpine 3.16 (with Python 3.10.5).
Bug fixes
*********