From f88d5577d1613bec96983220f97f552e30e0ab01 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 5 Feb 2024 18:25:14 +1100 Subject: [PATCH] [Docker] Pin postgresql version (#6407) * Update docker build - Pin postgresql libs to v13 * Fix typo --- Dockerfile | 8 +------- docker/install_build_packages.sh | 5 ++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index bab1adee50..60a61b13f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,13 +60,7 @@ RUN apk add --no-cache \ # Image format support libjpeg libwebp zlib \ # Weasyprint requirements : https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#alpine-3-12 - py3-pip py3-pillow py3-cffi py3-brotli pango poppler-utils openldap \ - # SQLite support - sqlite \ - # PostgreSQL support - postgresql-libs postgresql-client \ - # MySQL / MariaDB support - mariadb-connector-c-dev mariadb-client && \ + py3-pip py3-pillow py3-cffi py3-brotli pango poppler-utils openldap && \ # fonts apk --update --upgrade --no-cache add fontconfig ttf-freefont font-noto terminus-font && fc-cache -f diff --git a/docker/install_build_packages.sh b/docker/install_build_packages.sh index d25b1b4b5a..3ccb3d9370 100644 --- a/docker/install_build_packages.sh +++ b/docker/install_build_packages.sh @@ -1,8 +1,11 @@ #!/bin/ash # Install system packages required for building InvenTree python libraries +# Note that for postgreslql, we use the 13 version, which matches the version used in the InvenTree docker image apk add gcc g++ musl-dev openssl-dev libffi-dev cargo python3-dev openldap-dev \ jpeg-dev openjpeg-dev libwebp-dev zlib-dev \ - postgresql-dev sqlite-dev mariadb-dev \ + sqlite sqlite-dev \ + mariadb-connector-c-dev mariadb-client mariadb-dev \ + postgresql13-dev postgresql-libs postgresql13-client \ $@