Skip to content

Commit

Permalink
Merge pull request #1341 from maykinmedia/merge-1.19.0
Browse files Browse the repository at this point in the history
Merge 1.19.0
  • Loading branch information
alextreme authored Aug 8, 2024
2 parents e960021 + 36390cd commit 69630e7
Show file tree
Hide file tree
Showing 5 changed files with 205 additions and 195 deletions.
68 changes: 34 additions & 34 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
FROM python:3.11-slim-bookworm AS backend-build

RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
pkg-config \
build-essential \
git \
libpq-dev \
libxml2-dev \
libxmlsec1-dev \
libxmlsec1-openssl \
libgdk-pixbuf2.0-0 \
libffi-dev \
shared-mime-info \
# weasyprint deps (https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#debian-11)
libpango-1.0-0 \
libpangoft2-1.0-0 \
pkg-config \
build-essential \
git \
libpq-dev \
libxml2-dev \
libxmlsec1-dev \
libxmlsec1-openssl \
libgdk-pixbuf2.0-0 \
libffi-dev \
shared-mime-info \
# weasyprint deps (https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#debian-11)
libpango-1.0-0 \
libpangoft2-1.0-0 \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /app
Expand All @@ -32,7 +32,7 @@ COPY ./requirements /app/requirements
RUN uv pip install --system -r requirements/production.txt

RUN apt-get update && apt-get install -y --no-install-recommends \
git \
git \
&& rm -rf /var/lib/apt/lists/*

# Stage 2 - Install frontend deps and build assets
Expand Down Expand Up @@ -60,23 +60,23 @@ FROM python:3.11-slim-bookworm
# Note: mime-support becomes media-types in Debian Bullseye (required for correctly serving mime-types for images)
# Also install the dependencies for GeoDjango
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
curl \
procps \
nano \
mime-support \
postgresql-client \
libgdal32 \
libgeos-c1v5 \
libproj25 \
libxmlsec1-dev \
libxmlsec1-openssl \
libgdk-pixbuf2.0-0 \
libffi-dev \
gettext \
shared-mime-info \
# weasyprint deps (https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#debian-11)
libpango-1.0-0 \
libpangoft2-1.0-0 \
curl \
procps \
nano \
mime-support \
postgresql-client \
libgdal32 \
libgeos-c1v5 \
libproj25 \
libxmlsec1-dev \
libxmlsec1-openssl \
libgdk-pixbuf2.0-0 \
libffi-dev \
gettext \
shared-mime-info \
# weasyprint deps (https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#debian-11)
libpango-1.0-0 \
libpangoft2-1.0-0 \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /app
Expand Down Expand Up @@ -122,9 +122,9 @@ ENV EHERKENNING_MOCK=True
ARG SECRET_KEY=dummy

LABEL org.label-schema.vcs-ref=$COMMIT_HASH \
org.label-schema.vcs-url="https://github.com/maykinmedia/open-inwoner" \
org.label-schema.version=$RELEASE \
org.label-schema.name="Open Inwoner"
org.label-schema.vcs-url="https://github.com/maykinmedia/open-inwoner" \
org.label-schema.version=$RELEASE \
org.label-schema.name="Open Inwoner"

# Run collectstatic and compilemessages, so the result is already included in
# the image
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Open Inwoner
==================


:Version: 1.18.0
:Version: 1.19.0
:Source: https://github.com/maykinmedia/open-inwoner
:Documentation: https://docs.openinwoner.nl
:PythonVersion: 3.11
Expand Down
Empty file modified bin/setup_configuration.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion src/open_inwoner/conf/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@
# SENTRY - error monitoring
#
SENTRY_DSN = config("SENTRY_DSN", None)
RELEASE = "v1.18.0" # get_current_version()
RELEASE = "v1.19.0" # get_current_version()

PRIVATE_MEDIA_ROOT = os.path.join(BASE_DIR, "private_media")
FILER_ROOT = os.path.join(BASE_DIR, "media", "filer")
Expand Down
Loading

0 comments on commit 69630e7

Please sign in to comment.