From a146dfd5a5c49f61cd660a77410f2a4b48f16f6b Mon Sep 17 00:00:00 2001
From: Andrej Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 25 Apr 2022 16:20:58 +0200
Subject: [PATCH 1/2] Make sure the "t" bit is set on /tmp
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
---
docker/frontend-docker-entrypoint.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docker/frontend-docker-entrypoint.sh b/docker/frontend-docker-entrypoint.sh
index 1c64417c1a..5f1a1c008d 100755
--- a/docker/frontend-docker-entrypoint.sh
+++ b/docker/frontend-docker-entrypoint.sh
@@ -6,6 +6,8 @@ cd /obs/src/api
rm -rfv tmp/pids/*
chown -R frontend log tmp
+chmod a+rwxt /tmp
+
/opt/configure-app.sh
/opt/configure-db.sh
#/opt/configure-sso.py
--
GitLab
From cbfda8eb557e43d65cca261c870f2a1b2cc3b08f Mon Sep 17 00:00:00 2001
From: Andrej Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 25 Apr 2022 16:25:37 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Don=E2=80=99t=20try=20to=20repeatedly=20dis?=
=?UTF-8?q?able=20the=20signer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
---
docker/backend-docker-entrypoint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/backend-docker-entrypoint.sh b/docker/backend-docker-entrypoint.sh
index 5c8b56cfb8..6712288549 100755
--- a/docker/backend-docker-entrypoint.sh
+++ b/docker/backend-docker-entrypoint.sh
@@ -48,7 +48,7 @@ do
done
done
-if [ -z "$(/opt/get-obs-config sign)" ]
+if [ -z "$(/opt/get-obs-config sign)" ] && [ -f /etc/supervisor/conf.d/obssigner.conf ]
then
echo Signer not configured, disabling.
mv /etc/supervisor/conf.d/obssigner.conf /etc/supervisor/conf.d/obssigner.conf.disabled
--
GitLab