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 Docker container build to handle the new Rust requirement in thePython Cryptography module.

Browse Source
This commit is contained in:
Dave Page 2021-02-08 11:00:41 +00:00
parent 530eb3972b
commit 447a1c9dd7
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -64,7 +64,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.9-alpine3.12 as docs-builder FROM python:3.9-alpine3.13 as docs-builder
# Install dependencies # Install dependencies
COPY requirements.txt / COPY requirements.txt /
@ -74,7 +74,9 @@ RUN apk add --no-cache \
openssl-dev \ openssl-dev \
libffi-dev \ libffi-dev \
postgresql-dev \ postgresql-dev \
krb5-dev && \ krb5-dev \
rust \
cargo && \
pip install --no-cache-dir \ pip install --no-cache-dir \
sphinx && \ sphinx && \
pip install --no-cache-dir -r requirements.txt pip install --no-cache-dir -r requirements.txt
@ -102,7 +104,7 @@ 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 alpine:3.11 as tool-builder FROM alpine:3.13 as tool-builder
# Copy the PG binaries # Copy the PG binaries
@ -135,7 +137,7 @@ COPY --from=pg13-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-13/
# Assemble everything into the final container. # Assemble everything into the final container.
######################################################################### #########################################################################
FROM python:3.9-alpine3.12 FROM python:3.9-alpine3.13
COPY --from=tool-builder /usr/local/pgsql /usr/local/ COPY --from=tool-builder /usr/local/pgsql /usr/local/
@ -161,7 +163,9 @@ RUN apk add --no-cache --virtual \
krb5-dev \ krb5-dev \
e2fsprogs-dev \ e2fsprogs-dev \
krb5-server-ldap \ krb5-server-ldap \
linux-headers && \ linux-headers \
rust \
cargo && \
apk add \ apk add \
postfix \ postfix \
postgresql-client \ postgresql-client \