trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

root: remove separate postgresql repo 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-11-22 10:07:23 +01:00
parent 12ddf9e73c
commit f17b83010d
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Dockerfile
View File

@ -11,7 +11,7 @@ RUN pip install pipenv && \
pipenv lock -r --dev-only > requirements-dev.txt pipenv lock -r --dev-only > requirements-dev.txt
# Stage 2: Build website # Stage 2: Build website
FROM --platform=amd64 docker.io/node:16 as website-builder FROM --platform=${BUILDPLATFORM} docker.io/node:16 as website-builder
COPY ./website /static/ COPY ./website /static/
@ -19,7 +19,7 @@ ENV NODE_ENV=production
RUN cd /static && npm i && npm run build-docs-only RUN cd /static && npm i && npm run build-docs-only
# Stage 3: Build webui # Stage 3: Build webui
FROM --platform=amd64 docker.io/node:16 as web-builder FROM --platform=${BUILDPLATFORM} docker.io/node:16 as web-builder
COPY ./web /static/ COPY ./web /static/
@ -57,11 +57,10 @@ ARG GIT_BUILD_HASH
ENV GIT_BUILD_HASH=$GIT_BUILD_HASH ENV GIT_BUILD_HASH=$GIT_BUILD_HASH
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends curl ca-certificates gnupg git runit rustc && \ apt-get install -y --no-install-recommends \
curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ curl ca-certificates gnupg git runit rustc libpq-dev \
echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \ postgresql-client build-essential libxmlsec1-dev \
apt-get update && \ pkg-config libmaxminddb0 libffi7 libffi-dev zlib1g-dev && \
apt-get install -y --no-install-recommends libpq-dev postgresql-client build-essential libxmlsec1-dev pkg-config libmaxminddb0 libffi7 libffi-dev && \
pip install -r /requirements.txt --no-cache-dir && \ pip install -r /requirements.txt --no-cache-dir && \
apt-get remove --purge -y build-essential git rustc && \ apt-get remove --purge -y build-essential git rustc && \
apt-get autoremove --purge -y && \ apt-get autoremove --purge -y && \

2
proxy.Dockerfile
View File

@ -1,5 +1,5 @@
# Stage 1: Build website # Stage 1: Build website
FROM --platform=amd64 docker.io/node:16 as web-builder FROM --platform=${BUILDPLATFORM} docker.io/node:16 as web-builder
COPY ./web /static/ COPY ./web /static/