Skip to content

Commit

Permalink
Add pg_client postgres 15 (#14180)
Browse files Browse the repository at this point in the history
* Add pg_client postgres 15

* Remove overridden PGBIN
  • Loading branch information
oliverguenther authored Nov 21, 2023
1 parent 2a893aa commit a11a1a3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 5 additions & 2 deletions docker/prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ ENV APP_USER=app
ENV APP_PATH=/app
ENV APP_DATA_PATH=/var/openproject/assets
ENV PGVERSION="13"
ENV CURRENT_PGVERSION="13"
ENV NEXT_PGVERSION="15"
ENV PGBIN="/usr/lib/postgresql/$PGVERSION/bin"
ENV BUNDLE_WITHOUT="development:test"

Expand Down Expand Up @@ -101,11 +103,12 @@ RUN --mount=type=cache,target=/var/cache/apt \
curl \
gnupg2 \
&& curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
&& echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' $PGVERSION > /etc/apt/sources.list.d/pgdg.list \
&& echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
&& apt-get update -qq \
&& apt-get install -yq --no-install-recommends \
libpq5 \
postgresql-client-$PGVERSION \
postgresql-client-$CURRENT_PGVERSION \
postgresql-client-$NEXT_PGVERSION \
libffi7 \
unrtf tesseract-ocr poppler-utils catdoc imagemagick \
&& apt-get purge -y curl gnupg2 \
Expand Down
2 changes: 0 additions & 2 deletions docker/prod/setup/postinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
set -e
set -o pipefail

export PGBIN="$(pg_config --bindir)"

display_error() {
echo " !--> ERROR on postinstall:"
tail -n 200 /tmp/dockerize.log
Expand Down

0 comments on commit a11a1a3

Please sign in to comment.