From 7162b29ad41016a8a4b4dadcc89d0251eccbe7a3 Mon Sep 17 00:00:00 2001 From: Dennis Sieben Date: Mon, 21 Aug 2023 19:32:04 +0200 Subject: [PATCH 1/3] - fixed WOPISERVER_INSECURE in entrypoint skript for wopiserver --- .../examples/ocis_wopi/config/wopiserver/entrypoint-override.sh | 2 +- deployments/examples/ocis_wopi/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh index fd7960259..bda9db7ef 100755 --- a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh +++ b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e echo "${WOPISECRET}" > /etc/wopi/wopisecret diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index 8684696ab..d1b573380 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -166,7 +166,7 @@ services: networks: ocis-net: entrypoint: - - /bin/sh + - /bin/bash - /entrypoint-override.sh environment: WOPISERVER_INSECURE: "${INSECURE:-false}" From a810cf3906881f354efbb74e7b3d4ddf4c3b49fe Mon Sep 17 00:00:00 2001 From: Dennis Sieben Date: Fri, 25 Aug 2023 14:34:09 +0200 Subject: [PATCH 2/3] Revert "- fixed WOPISERVER_INSECURE in entrypoint skript for wopiserver" This reverts commit 7162b29ad41016a8a4b4dadcc89d0251eccbe7a3. --- .../examples/ocis_wopi/config/wopiserver/entrypoint-override.sh | 2 +- deployments/examples/ocis_wopi/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh index bda9db7ef..fd7960259 100755 --- a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh +++ b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e echo "${WOPISECRET}" > /etc/wopi/wopisecret diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index 8d9df8871..d363d6733 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -166,7 +166,7 @@ services: networks: ocis-net: entrypoint: - - /bin/bash + - /bin/sh - /entrypoint-override.sh environment: WOPISERVER_INSECURE: "${INSECURE:-false}" From 004ac82f304b959119f2486f71f1b3dfda0b69a6 Mon Sep 17 00:00:00 2001 From: Dennis Sieben Date: Fri, 25 Aug 2023 14:50:02 +0200 Subject: [PATCH 3/3] - changed script to be compatible with dash and busybox --- .../examples/ocis_wopi/config/wopiserver/entrypoint-override.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh index fd7960259..6fbb2a9b4 100755 --- a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh +++ b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh @@ -6,7 +6,7 @@ echo "${WOPISECRET}" > /etc/wopi/wopisecret cp /etc/wopi/wopiserver.conf.dist /etc/wopi/wopiserver.conf sed -i 's/wopiserver.owncloud.test/'${WOPISERVER_DOMAIN}'/g' /etc/wopi/wopiserver.conf -if [ "$WOPISERVER_INSECURE" == "true" ]; then +if [ "$WOPISERVER_INSECURE" = "true" ]; then sed -i 's/sslverify\s=\sTrue/sslverify = False/g' /etc/wopi/wopiserver.conf fi