Skip to content

Commit 2c5404d

Browse files
Merge branch 'dev' into authorization-query-optimize
2 parents a6b175d + 518a6e1 commit 2c5404d

30 files changed

Lines changed: 864 additions & 522 deletions

.dryrunsecurity.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ sensitiveCodepaths:
5252
- 'docker/entrypoint-celery-beat.sh'
5353
- 'docker/entrypoint-celery-worker.sh'
5454
- 'docker/entrypoint-initializer.sh'
55-
- 'docker/entrypoint-first-boot.sh'
5655
- 'docker/entrypoint-nginx.sh'
5756
- 'docker/entrypoint-uwsgi.sh'
5857
- 'docker/wait-for-it.sh'

.github/workflows/renovate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
uses: suzuki-shunsuke/github-action-renovate-config-validator@c22827f47f4f4a5364bdba19e1fe36907ef1318e # v1.1.1
2222
with:
2323
strict: "true"
24-
validator_version: 42.66.11 # renovate: datasource=github-releases depName=renovatebot/renovate
24+
validator_version: 42.71.0 # renovate: datasource=github-releases depName=renovatebot/renovate

.github/workflows/validate_docs_build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- 'docs/**'
7+
- '.github/workflows/*'
78

89
jobs:
910
deploy:

Dockerfile.django-alpine

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ COPY \
6969
docker/entrypoint-celery-beat.sh \
7070
docker/entrypoint-celery-worker.sh \
7171
docker/entrypoint-initializer.sh \
72-
docker/entrypoint-first-boot.sh \
7372
docker/entrypoint-uwsgi.sh \
7473
docker/wait-for-it.sh \
7574
docker/secret-file-loader.sh \

Dockerfile.django-debian

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.nginx to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.13.11-slim-trixie@sha256:baf66684c5fcafbda38a54b227ee30ec41e40af1e4073edee3a7110a417756ba AS base
8+
FROM python:3.13.11-slim-trixie@sha256:1f3781f578e17958f55ada96c0a827bf279a11e10d6a458ecb8bde667afbb669 AS base
99
FROM base AS build
1010
WORKDIR /app
1111
RUN \
@@ -72,7 +72,6 @@ COPY \
7272
docker/entrypoint-celery-beat.sh \
7373
docker/entrypoint-celery-worker.sh \
7474
docker/entrypoint-initializer.sh \
75-
docker/entrypoint-first-boot.sh \
7675
docker/entrypoint-uwsgi.sh \
7776
docker/wait-for-it.sh \
7877
docker/secret-file-loader.sh \

Dockerfile.integration-tests-debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
FROM openapitools/openapi-generator-cli:v7.18.0@sha256:be5c0a17c978ed4c39985312af3129882407581e07f2e3167cf777c908ffd52b AS openapitools
55
# currently only supports x64, no arm yet due to chrome and selenium dependencies
6-
FROM python:3.13.11-slim-trixie@sha256:baf66684c5fcafbda38a54b227ee30ec41e40af1e4073edee3a7110a417756ba AS build
6+
FROM python:3.13.11-slim-trixie@sha256:1f3781f578e17958f55ada96c0a827bf279a11e10d6a458ecb8bde667afbb669 AS build
77
WORKDIR /app
88
RUN \
99
apt-get -y update && \

components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"metismenu": "~3.0.7",
3434
"moment": "^2.30.1",
3535
"morris.js": "morrisjs/morris.js",
36-
"pdfmake": "^0.2.21",
36+
"pdfmake": "^0.3.0",
3737
"startbootstrap-sb-admin-2": "1.0.7"
3838
},
3939
"engines": {

0 commit comments

Comments
 (0)