Merge branch 'stable' into develop

2023-09-07 08:58:37 +02:00 · 2023-09-07 08:58:37 +02:00 · cc0f8f395c
commit cc0f8f395c
parent ec8dc8e09f 03f435193d
9 changed files with 583 additions and 560 deletions
--- a/api/Dockerfile
+++ b/api/Dockerfile
@ -74,13 +74,13 @@ ARG install_dev_deps=0
 RUN --mount=type=cache,target=~/.cache/pip; \
  set -eux; \
  if [ "$install_dev_deps" = "1" ] ; then \
-   grep -Ev 'cryptography|lxml|pillow|psycopg2|watchfiles' /dev-requirements.txt \
-   | pip3 install -r /dev/stdin \
-   cryptography==38.0.3 \
-   lxml==4.9.3 \
-   pillow==9.3.0 \
-   psycopg2==2.9.5 \
-   watchfiles==0.18.1; \
+    grep -Ev 'cryptography|lxml|pillow|psycopg2|watchfiles' /dev-requirements.txt \
+    | pip3 install -r /dev/stdin \
+    cryptography==38.0.3 \
+    lxml==4.9.3 \
+    pillow==9.3.0 \
+    psycopg2==2.9.5 \
+    watchfiles==0.18.1; \
  fi

 FROM alpine:3.17 as production