diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 9fc7fd092f..aa549c0361 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: db: - image: postgres:14 + image: postgres:13 restart: unless-stopped expose: - 5432/tcp diff --git a/contrib/container/Dockerfile b/contrib/container/Dockerfile index 63e5013524..572a286f5d 100644 --- a/contrib/container/Dockerfile +++ b/contrib/container/Dockerfile @@ -9,7 +9,7 @@ # - Runs InvenTree web server under django development server # - Monitors source files for any changes, and live-reloads server -ARG base_image=python:3.11-alpine3.20 +ARG base_image=python:3.11-alpine3.18 FROM ${base_image} AS inventree_base # Build arguments for this image @@ -64,7 +64,7 @@ RUN apk add --no-cache \ # 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 \ # Postgres client - postgresql14-client \ + postgresql13-client \ # MySQL / MariaDB client mariadb-client mariadb-connector-c \ && \ diff --git a/contrib/container/dev-docker-compose.yml b/contrib/container/dev-docker-compose.yml index 0fcffdc20b..4b84be12a5 100644 --- a/contrib/container/dev-docker-compose.yml +++ b/contrib/container/dev-docker-compose.yml @@ -20,7 +20,7 @@ services: # Use PostgreSQL as the database backend # Note: This can be changed to a different backend if required inventree-dev-db: - image: postgres:14 + image: postgres:13 expose: - 5432/tcp environment: diff --git a/contrib/container/docker-compose.yml b/contrib/container/docker-compose.yml index f565138c51..de38b655b8 100644 --- a/contrib/container/docker-compose.yml +++ b/contrib/container/docker-compose.yml @@ -38,7 +38,7 @@ services: # Database service # Use PostgreSQL as the database backend inventree-db: - image: postgres:14 + image: postgres:13 container_name: inventree-db expose: - ${INVENTREE_DB_PORT:-5432}/tcp diff --git a/contrib/container/install_build_packages.sh b/contrib/container/install_build_packages.sh index f549b867fd..bbeae43a54 100644 --- a/contrib/container/install_build_packages.sh +++ b/contrib/container/install_build_packages.sh @@ -1,12 +1,12 @@ #!/bin/ash # Install system packages required for building InvenTree python libraries -# Note that for postgreslql, we use the 14 version, which matches the version used in the InvenTree docker image +# Note that for postgreslql, we use the version 13, 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 \ libstdc++ build-base linux-headers py3-grpcio \ jpeg-dev openjpeg-dev libwebp-dev zlib-dev \ sqlite sqlite-dev \ mariadb-connector-c-dev mariadb-client mariadb-dev \ - postgresql14-dev postgresql-libs \ + postgresql13-dev postgresql-libs \ $@