Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1113e1ebed | ||
|
|
481a9216ce | ||
|
|
32c3d31407 |
@@ -56,10 +56,6 @@ services:
|
|||||||
oz-init:
|
oz-init:
|
||||||
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-1.28.2}
|
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-1.28.2}
|
||||||
environment: &oz-env
|
environment: &oz-env
|
||||||
# 1 uWSGI worker, not the image default of 4×4 (#147) — idle workers pressure the runner; the
|
|
||||||
# -init/-celery containers share this anchor and ignore it (they don't run uwsgi).
|
|
||||||
UWSGI_PROCESSES: "1"
|
|
||||||
UWSGI_THREADS: "2"
|
|
||||||
DJANGO_SETTINGS_MODULE: openzaak.conf.docker
|
DJANGO_SETTINGS_MODULE: openzaak.conf.docker
|
||||||
SECRET_KEY: ${OZ_SECRET_KEY:-dev-only-not-for-production}
|
SECRET_KEY: ${OZ_SECRET_KEY:-dev-only-not-for-production}
|
||||||
DB_HOST: oz-db
|
DB_HOST: oz-db
|
||||||
@@ -142,9 +138,6 @@ services:
|
|||||||
# bind-mounted here (this twin is the local/no-make path). See ADR-0007.
|
# bind-mounted here (this twin is the local/no-make path). See ADR-0007.
|
||||||
image: docker.io/openzaak/open-notificaties:${OPENNOTIFICATIES_TAG:-1.16.1}
|
image: docker.io/openzaak/open-notificaties:${OPENNOTIFICATIES_TAG:-1.16.1}
|
||||||
environment: &nrc-env
|
environment: &nrc-env
|
||||||
# 1 uWSGI worker, not the image default of 4×4 (#147) — see the oz-env note above.
|
|
||||||
UWSGI_PROCESSES: "1"
|
|
||||||
UWSGI_THREADS: "2"
|
|
||||||
DJANGO_SETTINGS_MODULE: nrc.conf.docker
|
DJANGO_SETTINGS_MODULE: nrc.conf.docker
|
||||||
SECRET_KEY: ${NRC_SECRET_KEY:-dev-only-not-for-production}
|
SECRET_KEY: ${NRC_SECRET_KEY:-dev-only-not-for-production}
|
||||||
DB_HOST: nrc-db
|
DB_HOST: nrc-db
|
||||||
@@ -590,9 +583,6 @@ services:
|
|||||||
objecttypen-init:
|
objecttypen-init:
|
||||||
image: docker.io/maykinmedia/objecttypes-api:${OBJECTTYPES_TAG:-3.4.2}
|
image: docker.io/maykinmedia/objecttypes-api:${OBJECTTYPES_TAG:-3.4.2}
|
||||||
environment: &objecttypen-env-local
|
environment: &objecttypen-env-local
|
||||||
# 1 uWSGI worker, not the image default of 4×4 (#144) — idle workers starve the CI runner.
|
|
||||||
UWSGI_PROCESSES: "1"
|
|
||||||
UWSGI_THREADS: "2"
|
|
||||||
DJANGO_SETTINGS_MODULE: objecttypes.conf.docker
|
DJANGO_SETTINGS_MODULE: objecttypes.conf.docker
|
||||||
SECRET_KEY: ${OBJECTTYPES_SECRET_KEY:-dev-only-not-for-production}
|
SECRET_KEY: ${OBJECTTYPES_SECRET_KEY:-dev-only-not-for-production}
|
||||||
DB_HOST: objecttypen-db
|
DB_HOST: objecttypen-db
|
||||||
@@ -654,9 +644,6 @@ services:
|
|||||||
objecten-init:
|
objecten-init:
|
||||||
image: docker.io/maykinmedia/objects-api:${OBJECTS_TAG:-3.4.0}
|
image: docker.io/maykinmedia/objects-api:${OBJECTS_TAG:-3.4.0}
|
||||||
environment: &objecten-env-local
|
environment: &objecten-env-local
|
||||||
# 1 uWSGI worker, not the image default of 4×4 (#144) — idle workers starve the CI runner.
|
|
||||||
UWSGI_PROCESSES: "1"
|
|
||||||
UWSGI_THREADS: "2"
|
|
||||||
DJANGO_SETTINGS_MODULE: objects.conf.docker
|
DJANGO_SETTINGS_MODULE: objects.conf.docker
|
||||||
SECRET_KEY: ${OBJECTS_SECRET_KEY:-dev-only-not-for-production}
|
SECRET_KEY: ${OBJECTS_SECRET_KEY:-dev-only-not-for-production}
|
||||||
DB_HOST: objecten-db
|
DB_HOST: objecten-db
|
||||||
|
|||||||
@@ -51,12 +51,6 @@ services:
|
|||||||
oz-init:
|
oz-init:
|
||||||
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-1.28.2}
|
image: docker.io/openzaak/open-zaak:${OPENZAAK_TAG:-1.28.2}
|
||||||
environment: &oz-env
|
environment: &oz-env
|
||||||
# 1 uWSGI worker, not the image default of 4×4 (#147, same lever as #145): OpenZaak serves
|
|
||||||
# single-request smoke checks here and is not load-tested, so 4 idle Django workers just pin
|
|
||||||
# ~800 MB and pressure the shared runner. The -init (setup_configuration) and -celery containers
|
|
||||||
# share this anchor and ignore it — they don't run uwsgi.
|
|
||||||
UWSGI_PROCESSES: "1"
|
|
||||||
UWSGI_THREADS: "2"
|
|
||||||
DJANGO_SETTINGS_MODULE: openzaak.conf.docker
|
DJANGO_SETTINGS_MODULE: openzaak.conf.docker
|
||||||
SECRET_KEY: ${OZ_SECRET_KEY:-dev-only-not-for-production}
|
SECRET_KEY: ${OZ_SECRET_KEY:-dev-only-not-for-production}
|
||||||
DB_HOST: oz-db
|
DB_HOST: oz-db
|
||||||
@@ -141,9 +135,6 @@ services:
|
|||||||
# needs no baked config.
|
# needs no baked config.
|
||||||
image: docker.io/openzaak/open-notificaties:${OPENNOTIFICATIES_TAG:-1.16.1}
|
image: docker.io/openzaak/open-notificaties:${OPENNOTIFICATIES_TAG:-1.16.1}
|
||||||
environment: &nrc-env
|
environment: &nrc-env
|
||||||
# 1 uWSGI worker, not the image default of 4×4 (#147) — see the oz-env note above.
|
|
||||||
UWSGI_PROCESSES: "1"
|
|
||||||
UWSGI_THREADS: "2"
|
|
||||||
DJANGO_SETTINGS_MODULE: nrc.conf.docker
|
DJANGO_SETTINGS_MODULE: nrc.conf.docker
|
||||||
SECRET_KEY: ${NRC_SECRET_KEY:-dev-only-not-for-production}
|
SECRET_KEY: ${NRC_SECRET_KEY:-dev-only-not-for-production}
|
||||||
DB_HOST: nrc-db
|
DB_HOST: nrc-db
|
||||||
@@ -605,11 +596,6 @@ services:
|
|||||||
objecttypen-init:
|
objecttypen-init:
|
||||||
image: docker.io/maykinmedia/objecttypes-api:${OBJECTTYPES_TAG:-3.4.2}
|
image: docker.io/maykinmedia/objecttypes-api:${OBJECTTYPES_TAG:-3.4.2}
|
||||||
environment: &objecttypen-env
|
environment: &objecttypen-env
|
||||||
# 1 uWSGI worker, not the image default of 4×4: this API only serves single-request smoke
|
|
||||||
# checks and sits idle during the e2e step — 4 idle Django workers each pin ~200 MB and starve
|
|
||||||
# the shared CI runner (#144). Init ignores this (it runs setup_configuration, not uwsgi).
|
|
||||||
UWSGI_PROCESSES: "1"
|
|
||||||
UWSGI_THREADS: "2"
|
|
||||||
DJANGO_SETTINGS_MODULE: objecttypes.conf.docker
|
DJANGO_SETTINGS_MODULE: objecttypes.conf.docker
|
||||||
SECRET_KEY: ${OBJECTTYPES_SECRET_KEY:-dev-only-not-for-production}
|
SECRET_KEY: ${OBJECTTYPES_SECRET_KEY:-dev-only-not-for-production}
|
||||||
DB_HOST: objecttypen-db
|
DB_HOST: objecttypen-db
|
||||||
@@ -676,9 +662,6 @@ services:
|
|||||||
objecten-init:
|
objecten-init:
|
||||||
image: docker.io/maykinmedia/objects-api:${OBJECTS_TAG:-3.4.0}
|
image: docker.io/maykinmedia/objects-api:${OBJECTS_TAG:-3.4.0}
|
||||||
environment: &objecten-env
|
environment: &objecten-env
|
||||||
# 1 uWSGI worker, not the image default of 4×4 — see the objecttypen note above (#144).
|
|
||||||
UWSGI_PROCESSES: "1"
|
|
||||||
UWSGI_THREADS: "2"
|
|
||||||
DJANGO_SETTINGS_MODULE: objects.conf.docker
|
DJANGO_SETTINGS_MODULE: objects.conf.docker
|
||||||
SECRET_KEY: ${OBJECTS_SECRET_KEY:-dev-only-not-for-production}
|
SECRET_KEY: ${OBJECTS_SECRET_KEY:-dev-only-not-for-production}
|
||||||
DB_HOST: objecten-db
|
DB_HOST: objecten-db
|
||||||
|
|||||||
Reference in New Issue
Block a user