From 0900db54b8f05a333dcb66f7acc59aba5a9ebb6a Mon Sep 17 00:00:00 2001 From: see Date: Fri, 8 Apr 2022 16:20:30 +0200 Subject: [PATCH] deleted entrypoint, changed install.sh --- .../image/resources/entrypoint.sh | 20 ------------------- .../image/resources/install.sh | 2 +- .../docker-jitsi-web/test/Dockerfile | 11 ---------- .../docker-jitsi-web/test/serverspec.edn | 1 - 4 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 infrastructure/docker-jitsi-web/image/resources/entrypoint.sh delete mode 100644 infrastructure/docker-jitsi-web/test/Dockerfile delete mode 100644 infrastructure/docker-jitsi-web/test/serverspec.edn diff --git a/infrastructure/docker-jitsi-web/image/resources/entrypoint.sh b/infrastructure/docker-jitsi-web/image/resources/entrypoint.sh deleted file mode 100644 index 2d88f15..0000000 --- a/infrastructure/docker-jitsi-web/image/resources/entrypoint.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -echo " -config.disableThirdPartyRequests = true; -config.defaultLanguage = 'de'; -config.resolution = 480; -config.constraints.video = { - aspectRatio: 16 / 9, - height: { - ideal: 480, - max: 480, - min: 240 - }; -config.channelLastN = 8; -config.enableLayerSuspension = true; -config.disableAudioLevels = true; -" >> /defaults/config.js - -/init \ No newline at end of file diff --git a/infrastructure/docker-jitsi-web/image/resources/install.sh b/infrastructure/docker-jitsi-web/image/resources/install.sh index 8f36e92..512c110 100755 --- a/infrastructure/docker-jitsi-web/image/resources/install.sh +++ b/infrastructure/docker-jitsi-web/image/resources/install.sh @@ -4,4 +4,4 @@ set -Eeo pipefail apt update > /dev/null install -m 0700 /tmp/install-debug.sh /usr/local/bin/ -install -m 0755 /tmp/entrypoint.sh / \ No newline at end of file +install -m 0644 /tmp/settings-config.js /defaults/settings-config.js \ No newline at end of file diff --git a/infrastructure/docker-jitsi-web/test/Dockerfile b/infrastructure/docker-jitsi-web/test/Dockerfile deleted file mode 100644 index 06f7cb8..0000000 --- a/infrastructure/docker-jitsi-web/test/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM c4k-jitsi - -RUN apt update -RUN mkdir /usr/share/man/man1/ -RUN apt -yqq install --no-install-recommends --yes curl default-jre-headless - -RUN curl -L -o /tmp/serverspec.jar https://github.com/DomainDrivenArchitecture/dda-serverspec-crate/releases/download/2.0.0/dda-serverspec-standalone.jar - -COPY serverspec.edn /tmp/serverspec.edn - -RUN java -jar /tmp/serverspec.jar /tmp/serverspec.edn -v diff --git a/infrastructure/docker-jitsi-web/test/serverspec.edn b/infrastructure/docker-jitsi-web/test/serverspec.edn deleted file mode 100644 index addfc6d..0000000 --- a/infrastructure/docker-jitsi-web/test/serverspec.edn +++ /dev/null @@ -1 +0,0 @@ -{:file [{:path "/entrypoint.sh" :mod "755"}]}