From 4720a6a4f986f627b3c25951b78614c88c48b7f1 Mon Sep 17 00:00:00 2001 From: Nick Satterly Date: Tue, 9 Apr 2024 15:06:42 +0200 Subject: [PATCH] Rollback debug changes --- Dockerfile | 4 ++-- README.md | 12 ------------ docker-entrypoint.sh | 1 - tests/docker-compose.test.mongodb.yml | 2 +- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6ca2d5e..f9f84f6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-slim-buster +FROM python:3.9-slim-buster ENV PYTHONUNBUFFERED 1 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 @@ -73,7 +73,7 @@ COPY requirements*.txt /app/ # hadolint ignore=DL3013 RUN pip install --no-cache-dir pip virtualenv jinja2 && \ python3 -m venv /venv && \ - /venv/bin/pip install --no-cache-dir --upgrade setuptools wheel && \ + /venv/bin/pip install --no-cache-dir --upgrade setuptools && \ /venv/bin/pip install --no-cache-dir --requirement /app/requirements.txt && \ /venv/bin/pip install --no-cache-dir --requirement /app/requirements-docker.txt ENV PATH $PATH:/venv/bin diff --git a/README.md b/README.md index 232be71e..83d5a640 100644 --- a/README.md +++ b/README.md @@ -129,18 +129,6 @@ API to ease deployment more generally: `GUNICORN_WORKERS` - number of worker processes for Gunicorn (default:`5`) -`UWSGI_LISTEN` - - max number of concurrent connections (default:`100`) - -`UWSGI_BUFFER_SIZE` - - size of the unix socket buffer (default:`8192`) - -`UWSGI_MAX_WORKER_LIFETIME` - - reload worker after this many seconds (default:`30`) - -`UWSGI_WORKER_LIFETIME_DELTA` - - time in seconds to stagger UWSGI worker respawns (default:`3`) - Configuration Files ------------------- diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index bb30e812..e9f32a28 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -67,7 +67,6 @@ if [ ! -f "${NGINX_CONF_FILE}" ]; then echo "# Create nginx configuration file." python3 -c "${JINJA2}" < ${NGINX_CONF_FILE}.j2 >${NGINX_CONF_FILE} fi -cat ${NGINX_CONF_FILE} nginx -t -c ${NGINX_CONF_FILE} # Generate Gunicorn config, if not supplied. diff --git a/tests/docker-compose.test.mongodb.yml b/tests/docker-compose.test.mongodb.yml index 9a3912cb..d9ca5d62 100644 --- a/tests/docker-compose.test.mongodb.yml +++ b/tests/docker-compose.test.mongodb.yml @@ -14,7 +14,7 @@ services: depends_on: - db environment: - - DEBUG=1 # remove this line to turn DEBUG off + # - DEBUG=1 # remove this line to turn DEBUG off - LOG_LEVEL=error # debug, info, warn (default), or error - SECRET_KEY=super-secret - DATABASE_URL=mongodb://db:27017/monitoring