Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert postgres version to 13 (#7717)

Browse Source 
* Adjust playwright test

* Update docker compose for devcontainer

* Revert docker container changes

* Update notes

* Revert base alpine version
This commit is contained in:
Oliver 2024-07-24 11:02:25 +10:00 committed by GitHub
parent d46ed4af6f
commit d5afc37264
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.devcontainer/docker-compose.yml
View File

@ -2,7 +2,7 @@ version: "3"
services: services:
db: db:
image: postgres:14 image: postgres:13
restart: unless-stopped restart: unless-stopped
expose: expose:
- 5432/tcp - 5432/tcp

4
contrib/container/Dockerfile
View File

@ -9,7 +9,7 @@
# - Runs InvenTree web server under django development server # - Runs InvenTree web server under django development server
# - Monitors source files for any changes, and live-reloads 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 FROM ${base_image} AS inventree_base
# Build arguments for this image # 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 # 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 \ py3-pip py3-pillow py3-cffi py3-brotli pango poppler-utils openldap \
# Postgres client # Postgres client
postgresql14-client \ postgresql13-client \
# MySQL / MariaDB client # MySQL / MariaDB client
mariadb-client mariadb-connector-c \ mariadb-client mariadb-connector-c \
&& \ && \

2
contrib/container/dev-docker-compose.yml
View File

@ -20,7 +20,7 @@ services:
# Use PostgreSQL as the database backend # Use PostgreSQL as the database backend
# Note: This can be changed to a different backend if required # Note: This can be changed to a different backend if required
inventree-dev-db: inventree-dev-db:
image: postgres:14 image: postgres:13
expose: expose:
- 5432/tcp - 5432/tcp
environment: environment:

2
contrib/container/docker-compose.yml
View File

@ -38,7 +38,7 @@ services:
# Database service # Database service
# Use PostgreSQL as the database backend # Use PostgreSQL as the database backend
inventree-db: inventree-db:
image: postgres:14 image: postgres:13
container_name: inventree-db container_name: inventree-db
expose: expose:
- ${INVENTREE_DB_PORT:-5432}/tcp - ${INVENTREE_DB_PORT:-5432}/tcp

4
contrib/container/install_build_packages.sh
View File

@ -1,12 +1,12 @@
#!/bin/ash #!/bin/ash
# Install system packages required for building InvenTree python libraries # 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 \ apk add gcc g++ musl-dev openssl-dev libffi-dev cargo python3-dev openldap-dev \
libstdc++ build-base linux-headers py3-grpcio \ libstdc++ build-base linux-headers py3-grpcio \
jpeg-dev openjpeg-dev libwebp-dev zlib-dev \ jpeg-dev openjpeg-dev libwebp-dev zlib-dev \
sqlite sqlite-dev \ sqlite sqlite-dev \
mariadb-connector-c-dev mariadb-client mariadb-dev \ mariadb-connector-c-dev mariadb-client mariadb-dev \
postgresql14-dev postgresql-libs \ postgresql13-dev postgresql-libs \
$@ $@