Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pg_client postgres 15 #14180

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Add pg_client postgres 15 #14180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c44c3ff
Add pg_client postgres 15
oliverguenther Nov 20, 2023
e3475e1
Remove overridden PGBIN
oliverguenther Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions docker/prod/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
Loading