Skip to content

Commit 4d8dbc2

Browse files
jennifer-richardsjennifer-richards
authored
chore: merge main to release
2 parents 0523c44 + b816bd6 commit 4d8dbc2

42 files changed

Lines changed: 2022 additions & 464 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ jobs:
466466
token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
467467
inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}" }'
468468
wait-for-completion: true
469-
wait-for-completion-timeout: 10m
469+
wait-for-completion-timeout: 30m
470470
wait-for-completion-interval: 30s
471471
display-workflow-run-url: false
472472

@@ -493,6 +493,6 @@ jobs:
493493
token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
494494
inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "appVersion":"${{ env.PKG_VERSION }}", "remoteRef":"${{ github.sha }}" }'
495495
wait-for-completion: true
496-
wait-for-completion-timeout: 10m
496+
wait-for-completion-timeout: 30m
497497
wait-for-completion-interval: 30s
498498
display-workflow-run-url: false

‎dev/build/datatracker-start.sh‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,6 @@ cleanup () {
4545
trap 'trap "" TERM; cleanup' TERM
4646

4747
# start gunicorn in the background so we can trap the TERM signal
48-
gunicorn \
49-
-c /workspace/gunicorn.conf.py \
50-
--workers "${DATATRACKER_GUNICORN_WORKERS:-9}" \
51-
--max-requests "${DATATRACKER_GUNICORN_MAX_REQUESTS:-32768}" \
52-
--timeout "${DATATRACKER_GUNICORN_TIMEOUT:-180}" \
53-
--bind :8000 \
54-
--log-level "${DATATRACKER_GUNICORN_LOG_LEVEL:-info}" \
55-
--capture-output \
56-
--access-logfile -\
57-
${DATATRACKER_GUNICORN_EXTRA_ARGS} \
58-
ietf.wsgi:application &
48+
gunicorn -c /workspace/gunicorn.conf.py ${DATATRACKER_GUNICORN_EXTRA_ARGS} ietf.wsgi:application &
5949
gunicorn_pid=$!
6050
wait "${gunicorn_pid}"

‎dev/build/gunicorn.conf.py‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2024-2025, All Rights Reserved
1+
# Copyright The IETF Trust 2024-2026, All Rights Reserved
22

33
import os
44
import ietf
@@ -12,6 +12,23 @@
1212
from opentelemetry.instrumentation.pymemcache import PymemcacheInstrumentor
1313
from opentelemetry.instrumentation.requests import RequestsInstrumentor
1414

15+
# Bind all ipv4 interfaces and ipv6 loopback interface. Would prefer to bind all
16+
# ipv6 as well, but something conflicts with [::]:8000.
17+
bind = ["0.0.0.0:8000", "[::1]:8000"]
18+
19+
# Disable control socket
20+
control_socket_disable = True
21+
22+
# Settings configurable via environment
23+
workers = int(os.environ.get("DATATRACKER_GUNICORN_WORKERS", "9"))
24+
max_requests = int(os.environ.get("DATATRACKER_GUNICORN_MAX_REQUESTS", "32768"))
25+
timeout = int(os.environ.get("DATATRACKER_GUNICORN_TIMEOUT", "180"))
26+
loglevel = os.environ.get("DATATRACKER_GUNICORN_LOG_LEVEL", "info")
27+
28+
# Logging / stdout capture
29+
capture_output = True
30+
accesslog = "-"
31+
1532
# Configure security scheme headers for forwarded requests. Cloudflare sets X-Forwarded-Proto
1633
# for us. Don't trust any of the other similar headers. Only trust the header if it's coming
1734
# from localhost, as all legitimate traffic will reach gunicorn via co-located nginx.

‎docker-compose.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,18 @@ services:
132132
volumes:
133133
- blobdb-data:/var/lib/postgresql/data
134134

135+
# typesense:
136+
# image: typesense/typesense:30.1
137+
# restart: on-failure
138+
# ports:
139+
# - "8108:8108"
140+
# volumes:
141+
# - ./typesense-data:/data
142+
# command:
143+
# - '--data-dir=/data'
144+
# - '--api-key=typesense-api-key'
145+
# - '--enable-cors'
146+
135147
# Celery Beat is a periodic task runner. It is not normally needed for development,
136148
# but can be enabled by uncommenting the following.
137149
#

0 commit comments

Comments
 (0)