From 7831503c190e4d3e994a079a24502817034fe5e2 Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Tue, 7 Dec 2021 13:44:13 -0800
Subject: [PATCH] fix(docker): use logging.prod.conf for sharness

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.yml            | 2 +-
 docker/scripts/run-tests.sh   | 3 +++
 docker/sharness-entrypoint.sh | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 docker/sharness-entrypoint.sh

diff --git a/docker-compose.yml b/docker-compose.yml
index 401193d5..af522b6e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -275,7 +275,7 @@ services:
     init: true
     environment:
       - AUR_CONFIG=conf/config.sqlite
-    entrypoint: /docker/test-sqlite-entrypoint.sh
+    entrypoint: /docker/sharness-entrypoint.sh
     command: /docker/scripts/run-sharness.sh
     stdin_open: true
     tty: true
diff --git a/docker/scripts/run-tests.sh b/docker/scripts/run-tests.sh
index a726c957..07e84822 100755
--- a/docker/scripts/run-tests.sh
+++ b/docker/scripts/run-tests.sh
@@ -6,7 +6,10 @@ dir=$(dirname $0)
 make -C test clean
 
 # Run sharness tests.
+cp -vf logging.conf logging.conf.bak
+cp -vf logging.prod.conf logging.conf
 bash $dir/run-sharness.sh
+cp -vf logging.conf.bak logging.conf
 
 # Run Python tests with MariaDB database.
 # Pass --silence to avoid reporting coverage. We will do that below.
diff --git a/docker/sharness-entrypoint.sh b/docker/sharness-entrypoint.sh
new file mode 100755
index 00000000..3a1b244c
--- /dev/null
+++ b/docker/sharness-entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eou pipefail
+
+cp -vf logging.prod.conf logging.conf
+
+exec "$@"