From 1be4ac2fde4f8d867fe476e52332f98ca18341f0 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Mon, 1 Nov 2021 12:27:33 -0700 Subject: [PATCH] feat(docker): use PROMETHEUS_MULTIPROC_DIR Signed-off-by: Kevin Morris --- docker-compose.aur-dev.yml | 1 + docker-compose.yml | 1 + docker/fastapi-entrypoint.sh | 3 +++ 3 files changed, 5 insertions(+) diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml index 3f574d42..1db306cc 100644 --- a/docker-compose.aur-dev.yml +++ b/docker-compose.aur-dev.yml @@ -53,6 +53,7 @@ services: - FASTAPI_WORKERS=${FASTAPI_WORKERS} - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX} - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX} + - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus volumes: - cache:/cache diff --git a/docker-compose.yml b/docker-compose.yml index 2b25c7d8..6c822e7c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -168,6 +168,7 @@ services: - FASTAPI_WORKERS=${FASTAPI_WORKERS} - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX} - AURWEB_SSHD_PREFIX=${AURWEB_SSHD_PREFIX} + - PROMETHEUS_MULTIPROC_DIR=/tmp_prometheus entrypoint: /docker/fastapi-entrypoint.sh command: /docker/scripts/run-fastapi.sh "${FASTAPI_BACKEND}" healthcheck: diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh index 58fafe56..f4ceaafa 100755 --- a/docker/fastapi-entrypoint.sh +++ b/docker/fastapi-entrypoint.sh @@ -18,4 +18,7 @@ fi sed -ri "s|^(git_clone_uri_anon) = .+|\1 = ${AURWEB_FASTAPI_PREFIX}/%s.git|" conf/config.defaults sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ${AURWEB_SSHD_PREFIX}/%s.git|" conf/config.defaults +rm -rf $PROMETHEUS_MULTIPROC_DIR +mkdir -p $PROMETHEUS_MULTIPROC_DIR + exec "$@"