Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11
FROM python:3.11-bookworm
ENV INSIDE_DOCKER=1 \
PYTHONUNBUFFERED=1 \
PYTHONDONTWRITEBYTECODE=1 \
Expand All @@ -16,6 +16,7 @@ RUN curl -sSL https://install.python-poetry.org | python -
ENV PATH="/root/.local/bin:$PATH"
WORKDIR $PYSETUP_PATH
COPY poetry.lock pyproject.toml ./
RUN poetry config keyring.enabled false
RUN poetry install --no-root
# Not needed (mapping handled by docker-compose)
# WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion caps/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
path("404/", views.NotFoundPageView.as_view(), name="404"),
]

if settings.DEBUG:
if settings.DEBUG and settings.HIDE_DEBUG_TOOLBAR == False:
import debug_toolbar

urlpatterns += [
Expand Down
8 changes: 3 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.7'

services:
app:
image: mysociety/caps:${TAG:-latest}
Expand Down Expand Up @@ -45,9 +43,9 @@ services:
- 25:25

postgres:
image: postgres:13
image: postgres:15
volumes:
- postgres_data_13:/var/lib/postgresql/data/
- postgres_data_15:/var/lib/postgresql/data/
environment:
- POSTGRES_USER=${REPOSITORY_DB_USER:-caps}
- POSTGRES_PASSWORD=${REPOSITORY_DB_PASS:-caps}
Expand All @@ -68,5 +66,5 @@ services:
- 8983:8983

volumes:
postgres_data_13:
postgres_data_15:
solr_data:
Loading
Loading