Skip to content

Commit

Permalink
Merge main into stable/4.1.x. Update 20231214
Browse files Browse the repository at this point in the history
* commit 'd1945c20cf3aa74077c41e72738ea62b560799d0':
  Use postgres 15 images + debian bookworm images (#292)
  Bump isort from 5.13.0 to 5.13.1 in /requirements (#291)
  Bump black from 23.11.0 to 23.12.0 in /requirements (#290)
  Bump isort from 5.12.0 to 5.13.0 in /requirements (#289)
  • Loading branch information
peb-adr committed Dec 14, 2023
2 parents 4c39e34 + d1945c2 commit a531a1c
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.12-slim-buster
FROM python:3.10.13-slim-bookworm

RUN apt-get -y update && apt-get -y upgrade && \
apt-get install --no-install-recommends -y wait-for-it gcc libpq-dev libc-dev postgresql-client redis-tools
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.12-slim-buster
FROM python:3.10.13-slim-bookworm

RUN apt-get -y update && apt-get -y upgrade && \
apt-get install --no-install-recommends -y wait-for-it gcc libpq-dev libc-dev postgresql-client redis-tools
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.12-slim-buster
FROM python:3.10.13-slim-bookworm

RUN apt-get -y update && apt-get -y upgrade && \
apt-get install --no-install-recommends -y wait-for-it gcc libpq-dev libc-dev postgresql-client redis-tools
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.12-slim-buster
FROM python:3.10.13-slim-bookworm

RUN apt-get -y update && apt-get -y upgrade && \
apt-get install --no-install-recommends -y wait-for-it vim gcc libpq-dev libc-dev postgresql-client redis-tools curl
Expand Down
2 changes: 1 addition & 1 deletion dc.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:
stdin_open: true
tty: true
postgres:
image: postgres:13
image: postgres:15
env_file: database.env
networks:
- postgres
Expand Down
2 changes: 1 addition & 1 deletion dc.external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
- postgres
- redis
postgres:
image: postgres:13
image: postgres:15
environment:
- POSTGRES_USER=openslides
- POSTGRES_PASSWORD=openslides
Expand Down
2 changes: 1 addition & 1 deletion dc.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
ports:
- "5679:5678"
postgres:
image: postgres:13
image: postgres:15
env_file: database.env
networks:
- postgres
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
secrets:
- postgres_password
postgres:
image: postgres:13
image: postgres:15
env_file: database.env
networks:
- postgres
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements-testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ pytest==7.4.3
pytest-cov==4.1.0

# linting & formatting
black==23.11.0
black==23.12.0
autoflake==2.2.1
isort==5.12.0
isort==5.13.1
flake8==6.1.0
mypy==1.7.1

Expand Down
2 changes: 1 addition & 1 deletion system_tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10.3-slim-buster
FROM python:3.10.13-slim-bookworm

RUN apt-get -y update && apt-get -y upgrade && \
apt-get install --no-install-recommends -y wait-for-it gcc libpq-dev libc-dev postgresql-client redis-tools
Expand Down

0 comments on commit a531a1c

Please sign in to comment.